From 26311217f5dfa70240feccd949e8bc3f7469fc05 Mon Sep 17 00:00:00 2001 From: CrazyMax Date: Fri, 8 Apr 2022 21:37:44 +0200 Subject: [PATCH 1/7] Convert to Go module github.com/moby/swarmkit/v2 Co-authored-by: Cory Snider Signed-off-by: CrazyMax Signed-off-by: Cory Snider --- .gitattributes | 2 - .gitignore | 3 - BUILDING.md | 2 +- Dockerfile | 2 +- Makefile | 2 - agent/agent.go | 6 +- agent/agent_test.go | 18 +- agent/config.go | 6 +- agent/configs/configs.go | 4 +- agent/csi/plugin/manager.go | 2 +- agent/csi/plugin/manager_test.go | 2 +- agent/csi/plugin/plugin.go | 4 +- agent/csi/plugin/plugin_fake_test.go | 2 +- agent/csi/plugin/plugin_test.go | 4 +- agent/csi/plugin_manager_fake_test.go | 4 +- agent/csi/volume_manager_test.go | 6 +- agent/csi/volumes.go | 10 +- agent/dependency.go | 10 +- agent/exec/controller.go | 8 +- agent/exec/controller_stub.go | 2 +- agent/exec/controller_test.go | 4 +- agent/exec/dockerapi/adapter.go | 6 +- agent/exec/dockerapi/container.go | 10 +- agent/exec/dockerapi/container_test.go | 2 +- agent/exec/dockerapi/controller.go | 6 +- .../dockerapi/controller_integration_test.go | 6 +- agent/exec/dockerapi/controller_test.go | 8 +- agent/exec/dockerapi/executor.go | 8 +- agent/exec/executor.go | 2 +- agent/reporter.go | 4 +- agent/reporter_test.go | 2 +- agent/resource.go | 2 +- agent/secrets/secrets.go | 6 +- agent/secrets/secrets_test.go | 6 +- agent/session.go | 6 +- agent/storage.go | 2 +- agent/storage_test.go | 4 +- agent/task.go | 8 +- agent/task_test.go | 4 +- agent/testutils/fakes.go | 10 +- agent/worker.go | 8 +- agent/worker_test.go | 8 +- api/api.pb.txt | 20 +- api/ca.pb.go | 10 +- api/control.pb.go | 138 +-- api/defaults/service.go | 4 +- api/dispatcher.pb.go | 34 +- api/equality/equality.go | 2 +- api/equality/equality_test.go | 2 +- api/genericresource/helpers.go | 2 +- api/genericresource/helpers_test.go | 2 +- api/genericresource/parse.go | 2 +- api/genericresource/resource_management.go | 2 +- .../resource_management_test.go | 2 +- api/genericresource/string.go | 2 +- api/genericresource/validate.go | 2 +- api/health.pb.go | 2 +- api/logbroker.pb.go | 24 +- api/naming/naming.go | 2 +- api/naming/naming_test.go | 2 +- api/objects.pb.go | 118 +-- api/raft.pb.go | 32 +- api/resource.pb.go | 6 +- api/snapshot.pb.go | 28 +- api/specs.pb.go | 110 +-- api/types.pb.go | 136 +-- api/watch.pb.go | 44 +- ca/auth.go | 4 +- ca/certificates.go | 8 +- ca/certificates_test.go | 18 +- ca/config.go | 10 +- ca/config_test.go | 14 +- ca/external.go | 2 +- ca/external_test.go | 6 +- ca/keyreadwriter.go | 6 +- ca/keyreadwriter_test.go | 8 +- ca/keyutils/keyutils.go | 2 +- ca/reconciler.go | 8 +- ca/renewer.go | 4 +- ca/renewer_test.go | 8 +- ca/server.go | 10 +- ca/server_test.go | 14 +- ca/testutils/cautils.go | 20 +- ca/testutils/externalutils.go | 2 +- cli/external_ca.go | 2 +- cli/external_ca_test.go | 2 +- cmd/external-ca-example/main.go | 6 +- cmd/protoc-gen-gogoswarm/main.go | 8 +- cmd/swarm-bench/benchmark.go | 2 +- cmd/swarm-bench/collector.go | 2 +- cmd/swarm-rafttool/common.go | 10 +- cmd/swarm-rafttool/common_test.go | 12 +- cmd/swarm-rafttool/dump.go | 8 +- cmd/swarm-rafttool/main.go | 2 +- cmd/swarmctl/cluster/common.go | 2 +- cmd/swarmctl/cluster/inspect.go | 4 +- cmd/swarmctl/cluster/list.go | 4 +- cmd/swarmctl/cluster/unlockkey.go | 6 +- cmd/swarmctl/cluster/update.go | 6 +- cmd/swarmctl/common/common.go | 4 +- cmd/swarmctl/common/resolver.go | 2 +- cmd/swarmctl/config/common.go | 2 +- cmd/swarmctl/config/create.go | 4 +- cmd/swarmctl/config/inspect.go | 4 +- cmd/swarmctl/config/list.go | 4 +- cmd/swarmctl/config/remove.go | 4 +- cmd/swarmctl/main.go | 18 +- cmd/swarmctl/network/common.go | 2 +- cmd/swarmctl/network/create.go | 4 +- cmd/swarmctl/network/inspect.go | 4 +- cmd/swarmctl/network/list.go | 4 +- cmd/swarmctl/network/remove.go | 4 +- cmd/swarmctl/node/activate.go | 2 +- cmd/swarmctl/node/common.go | 4 +- cmd/swarmctl/node/demote.go | 2 +- cmd/swarmctl/node/drain.go | 2 +- cmd/swarmctl/node/inspect.go | 8 +- cmd/swarmctl/node/list.go | 4 +- cmd/swarmctl/node/pause.go | 2 +- cmd/swarmctl/node/promote.go | 2 +- cmd/swarmctl/node/remove.go | 4 +- cmd/swarmctl/secret/common.go | 2 +- cmd/swarmctl/secret/create.go | 4 +- cmd/swarmctl/secret/inspect.go | 4 +- cmd/swarmctl/secret/list.go | 4 +- cmd/swarmctl/secret/remove.go | 4 +- cmd/swarmctl/service/common.go | 2 +- cmd/swarmctl/service/create.go | 6 +- cmd/swarmctl/service/flagparser/bind.go | 2 +- cmd/swarmctl/service/flagparser/capability.go | 2 +- cmd/swarmctl/service/flagparser/config.go | 4 +- cmd/swarmctl/service/flagparser/container.go | 2 +- cmd/swarmctl/service/flagparser/flags.go | 4 +- cmd/swarmctl/service/flagparser/mode.go | 2 +- cmd/swarmctl/service/flagparser/network.go | 6 +- cmd/swarmctl/service/flagparser/npipe.go | 2 +- cmd/swarmctl/service/flagparser/placement.go | 2 +- cmd/swarmctl/service/flagparser/port.go | 2 +- cmd/swarmctl/service/flagparser/resource.go | 4 +- cmd/swarmctl/service/flagparser/restart.go | 2 +- cmd/swarmctl/service/flagparser/secret.go | 4 +- cmd/swarmctl/service/flagparser/tmpfs.go | 2 +- cmd/swarmctl/service/flagparser/update.go | 2 +- cmd/swarmctl/service/flagparser/volume.go | 2 +- cmd/swarmctl/service/inspect.go | 8 +- cmd/swarmctl/service/list.go | 4 +- cmd/swarmctl/service/logs.go | 4 +- cmd/swarmctl/service/remove.go | 4 +- cmd/swarmctl/service/update.go | 6 +- cmd/swarmctl/task/inspect.go | 4 +- cmd/swarmctl/task/list.go | 4 +- cmd/swarmctl/task/print.go | 4 +- cmd/swarmctl/task/remove.go | 4 +- cmd/swarmd/main.go | 18 +- connectionbroker/broker.go | 4 +- containerized.mk | 2 +- direct.mk | 22 +- vendor.mod => go.mod | 12 +- vendor.sum => go.sum | 375 +------- integration/api.go | 2 +- integration/cluster.go | 14 +- integration/integration_test.go | 14 +- integration/node.go | 10 +- manager/allocator/allocator.go | 8 +- manager/allocator/allocator_linux_test.go | 6 +- manager/allocator/allocator_test.go | 6 +- .../allocator/cnmallocator/drivers_darwin.go | 2 +- .../cnmallocator/drivers_network_linux.go | 2 +- .../cnmallocator/drivers_network_windows.go | 2 +- .../cnmallocator/drivers_unsupported.go | 2 +- .../cnmallocator/networkallocator.go | 6 +- .../cnmallocator/networkallocator_test.go | 4 +- .../allocator/cnmallocator/portallocator.go | 2 +- .../cnmallocator/portallocator_test.go | 2 +- manager/allocator/network.go | 14 +- manager/allocator/network_test.go | 2 +- .../networkallocator/networkallocator.go | 2 +- manager/constraint/constraint.go | 2 +- manager/controlapi/ca_rotation.go | 6 +- manager/controlapi/ca_rotation_test.go | 6 +- manager/controlapi/cluster.go | 10 +- manager/controlapi/cluster_test.go | 12 +- manager/controlapi/common.go | 6 +- manager/controlapi/common_test.go | 4 +- manager/controlapi/config.go | 8 +- manager/controlapi/config_test.go | 6 +- manager/controlapi/extension.go | 8 +- manager/controlapi/extension_test.go | 6 +- manager/controlapi/network.go | 10 +- manager/controlapi/network_test.go | 8 +- manager/controlapi/node.go | 6 +- manager/controlapi/node_test.go | 12 +- manager/controlapi/resource.go | 8 +- manager/controlapi/resource_test.go | 6 +- manager/controlapi/secret.go | 10 +- manager/controlapi/secret_test.go | 6 +- manager/controlapi/server.go | 8 +- manager/controlapi/server_test.go | 10 +- manager/controlapi/service.go | 20 +- manager/controlapi/service_test.go | 8 +- manager/controlapi/task.go | 8 +- manager/controlapi/task_test.go | 8 +- manager/controlapi/volume.go | 6 +- manager/controlapi/volume_test.go | 6 +- manager/csi/convert.go | 2 +- manager/csi/fakes_test.go | 2 +- manager/csi/manager.go | 8 +- manager/csi/manager_test.go | 6 +- manager/csi/plugin.go | 2 +- manager/csi/plugin_test.go | 2 +- manager/csi/secret.go | 4 +- manager/deallocator/deallocator.go | 6 +- manager/deallocator/deallocator_test.go | 4 +- manager/deks.go | 6 +- manager/deks_test.go | 6 +- manager/dirty.go | 4 +- manager/dirty_test.go | 10 +- manager/dispatcher/assignments.go | 12 +- manager/dispatcher/assignments_test.go | 6 +- manager/dispatcher/dispatcher.go | 18 +- manager/dispatcher/dispatcher_test.go | 14 +- manager/dispatcher/nodes.go | 6 +- manager/drivers/provider.go | 2 +- manager/drivers/secrets.go | 4 +- manager/encryption/encryption.go | 2 +- manager/encryption/fernet.go | 2 +- manager/encryption/fernet_test.go | 2 +- manager/encryption/nacl.go | 2 +- manager/encryption/nacl_test.go | 2 +- manager/health/health.go | 2 +- manager/keymanager/keymanager.go | 6 +- manager/keymanager/keymanager_test.go | 4 +- manager/logbroker/broker.go | 12 +- manager/logbroker/broker_test.go | 10 +- manager/logbroker/subscription.go | 10 +- manager/manager.go | 60 +- manager/manager_test.go | 18 +- manager/metrics/collector.go | 4 +- .../constraintenforcer/constraint_enforcer.go | 14 +- .../constraint_enforcer_test.go | 8 +- manager/orchestrator/global/global.go | 16 +- manager/orchestrator/global/global_test.go | 10 +- manager/orchestrator/jobs/fakes_test.go | 10 +- .../orchestrator/jobs/global/reconciler.go | 8 +- .../jobs/global/reconciler_test.go | 6 +- manager/orchestrator/jobs/orchestrator.go | 16 +- ...rchestrator_controlapi_integration_test.go | 10 +- .../jobs/orchestrator_restart_test.go | 4 +- .../orchestrator/jobs/orchestrator_test.go | 6 +- .../jobs/replicated/reconciler.go | 6 +- .../jobs/replicated/reconciler_test.go | 6 +- manager/orchestrator/replicated/drain_test.go | 8 +- manager/orchestrator/replicated/replicated.go | 10 +- .../replicated/replicated_test.go | 10 +- .../orchestrator/replicated/restart_test.go | 10 +- manager/orchestrator/replicated/services.go | 8 +- manager/orchestrator/replicated/slot.go | 6 +- manager/orchestrator/replicated/tasks.go | 10 +- .../orchestrator/replicated/update_test.go | 8 +- manager/orchestrator/restart/restart.go | 12 +- manager/orchestrator/service.go | 6 +- manager/orchestrator/service_test.go | 2 +- manager/orchestrator/slot.go | 2 +- manager/orchestrator/task.go | 10 +- manager/orchestrator/task_test.go | 2 +- manager/orchestrator/taskinit/init.go | 12 +- .../orchestrator/taskreaper/task_reaper.go | 10 +- .../taskreaper/task_reaper_test.go | 14 +- manager/orchestrator/testutils/testutils.go | 4 +- manager/orchestrator/update/updater.go | 18 +- manager/orchestrator/update/updater_test.go | 10 +- .../volumeenforcer/volume_enforcer.go | 6 +- .../volumeenforcer/volume_enforcer_test.go | 4 +- manager/resourceapi/allocator.go | 10 +- manager/role_manager.go | 10 +- manager/role_manager_test.go | 10 +- manager/scheduler/constraint_test.go | 2 +- manager/scheduler/filter.go | 6 +- manager/scheduler/nodeinfo.go | 6 +- manager/scheduler/nodeinfo_test.go | 4 +- manager/scheduler/nodeset.go | 4 +- manager/scheduler/pipeline.go | 2 +- manager/scheduler/scheduler.go | 12 +- manager/scheduler/scheduler_ginkgo_test.go | 6 +- manager/scheduler/scheduler_test.go | 10 +- manager/scheduler/topology.go | 2 +- manager/scheduler/topology_test.go | 2 +- manager/scheduler/volumes.go | 4 +- manager/scheduler/volumes_test.go | 4 +- manager/state/proposer.go | 2 +- manager/state/raft/membership/cluster.go | 4 +- manager/state/raft/membership/cluster_test.go | 12 +- manager/state/raft/raft.go | 20 +- manager/state/raft/raft_test.go | 16 +- manager/state/raft/storage.go | 12 +- manager/state/raft/storage/common_test.go | 4 +- manager/state/raft/storage/snapwrap.go | 2 +- manager/state/raft/storage/snapwrap_test.go | 4 +- manager/state/raft/storage/storage.go | 4 +- manager/state/raft/storage/storage_test.go | 2 +- manager/state/raft/storage/walwrap.go | 4 +- manager/state/raft/storage/walwrap_test.go | 4 +- manager/state/raft/storage_test.go | 12 +- manager/state/raft/testutils/testutils.go | 16 +- .../state/raft/transport/mock_raft_test.go | 8 +- manager/state/raft/transport/peer.go | 6 +- manager/state/raft/transport/transport.go | 2 +- manager/state/raft/util.go | 6 +- manager/state/store/apply.go | 4 +- manager/state/store/by.go | 2 +- manager/state/store/clusters.go | 2 +- manager/state/store/configs.go | 2 +- manager/state/store/extensions.go | 2 +- manager/state/store/memory.go | 8 +- manager/state/store/memory_test.go | 8 +- manager/state/store/networks.go | 2 +- manager/state/store/nodes.go | 2 +- manager/state/store/object.go | 2 +- manager/state/store/resources.go | 2 +- manager/state/store/secrets.go | 2 +- manager/state/store/services.go | 4 +- manager/state/store/tasks.go | 4 +- manager/state/store/volumes.go | 2 +- manager/state/testutils/mock_proposer.go | 4 +- manager/state/watch.go | 4 +- manager/watchapi/server.go | 2 +- manager/watchapi/server_test.go | 8 +- manager/watchapi/watch.go | 6 +- manager/watchapi/watch_test.go | 4 +- node/node.go | 28 +- node/node_test.go | 20 +- .../authenticatedwrapper.go | 2 +- protobuf/plugin/deepcopy/deepcopy.go | 4 +- protobuf/plugin/deepcopy/test/deepcopy.pb.go | 38 +- protobuf/plugin/plugin.pb.go | 4 +- protobuf/plugin/raftproxy/raftproxy.go | 2 +- .../plugin/raftproxy/test/raftproxy_test.go | 2 +- protobuf/plugin/raftproxy/test/service.pb.go | 12 +- protobuf/plugin/storeobject/storeobject.go | 2 +- remotes/remotes.go | 2 +- remotes/remotes_test.go | 2 +- template/context.go | 10 +- template/context_test.go | 2 +- template/expand.go | 4 +- template/getter.go | 4 +- template/getter_test.go | 6 +- tools/go.mod | 7 +- tools/go.sum | 8 +- .../github.com/containerd/containerd/LICENSE | 191 ---- .../github.com/containerd/containerd/NOTICE | 16 - .../containerd/containerd/errdefs/errors.go | 93 -- .../containerd/containerd/errdefs/grpc.go | 147 --- .../registry/api/errcode/errors.go | 267 ------ .../registry/api/errcode/handler.go | 40 - .../registry/api/errcode/register.go | 138 --- vendor/github.com/docker/docker/AUTHORS | 72 +- .../github.com/docker/docker/api/swagger.yaml | 613 +++++++----- .../api/types/container/container_wait.go | 28 - .../container/container_wait_o_k_body.go | 19 + .../container_wait_o_k_body_error.go | 12 + .../docker/api/types/container/host_config.go | 19 +- .../docker/docker/api/types/filters/parse.go | 9 +- .../docker/api/types/graph_driver_data.go | 12 +- .../docker/docker/api/types/swarm/swarm.go | 10 + .../docker/docker/api/types/types.go | 181 +++- .../docker/api/types/volume/volume_create.go | 31 - .../api/types/volume/volume_create_body.go | 26 + .../docker/docker/client/checkpoint_list.go | 2 +- .../github.com/docker/docker/client/client.go | 112 ++- .../docker/docker/client/client_unix.go | 3 +- .../docker/docker/client/client_windows.go | 3 +- .../docker/docker/client/config_inspect.go | 2 +- .../docker/docker/client/config_remove.go | 2 +- .../docker/docker/client/container_copy.go | 6 +- .../docker/docker/client/container_inspect.go | 4 +- .../docker/docker/client/container_list.go | 2 +- .../docker/docker/client/container_logs.go | 2 +- .../docker/docker/client/container_remove.go | 2 +- .../docker/docker/client/container_wait.go | 4 +- .../docker/docker/client/envvars.go | 90 ++ .../github.com/docker/docker/client/errors.go | 14 - .../docker/docker/client/image_inspect.go | 2 +- .../docker/docker/client/image_remove.go | 2 +- .../docker/docker/client/image_search.go | 6 +- .../docker/docker/client/network_inspect.go | 2 +- .../docker/docker/client/network_remove.go | 2 +- .../docker/docker/client/node_inspect.go | 2 +- .../docker/docker/client/node_remove.go | 2 +- .../docker/docker/client/options.go | 105 ++- .../github.com/docker/docker/client/ping.go | 9 + .../docker/docker/client/plugin_inspect.go | 2 +- .../docker/docker/client/plugin_list.go | 2 +- .../docker/docker/client/plugin_remove.go | 2 +- .../docker/docker/client/request.go | 10 +- .../docker/docker/client/secret_inspect.go | 2 +- .../docker/docker/client/secret_remove.go | 2 +- .../docker/docker/client/service_create.go | 2 +- .../docker/docker/client/service_inspect.go | 2 +- .../docker/docker/client/service_remove.go | 2 +- .../docker/docker/client/task_inspect.go | 2 +- .../docker/docker/client/volume_inspect.go | 2 +- .../docker/docker/client/volume_remove.go | 2 +- .../docker/docker/errdefs/http_helpers.go | 138 --- .../gogo/protobuf/protobuf/Makefile | 65 ++ .../protobuf/google/protobuf/any.proto | 155 +++ .../protobuf/google/protobuf/api.proto | 210 +++++ .../google/protobuf/compiler/plugin.proto | 168 ++++ .../protobuf/google/protobuf/descriptor.proto | 885 ++++++++++++++++++ .../protobuf/google/protobuf/duration.proto | 116 +++ .../protobuf/google/protobuf/empty.proto | 52 + .../protobuf/google/protobuf/field_mask.proto | 245 +++++ .../google/protobuf/source_context.proto | 48 + .../protobuf/google/protobuf/struct.proto | 95 ++ .../protobuf/google/protobuf/timestamp.proto | 138 +++ .../protobuf/google/protobuf/type.proto | 187 ++++ .../protobuf/google/protobuf/wrappers.proto | 123 +++ vendor/modules.txt | 10 +- version/version.go | 2 +- watch/watch.go | 2 +- 419 files changed, 4835 insertions(+), 3289 deletions(-) delete mode 100644 .gitattributes rename vendor.mod => go.mod (93%) rename vendor.sum => go.sum (76%) delete mode 100644 vendor/github.com/containerd/containerd/LICENSE delete mode 100644 vendor/github.com/containerd/containerd/NOTICE delete mode 100644 vendor/github.com/containerd/containerd/errdefs/errors.go delete mode 100644 vendor/github.com/containerd/containerd/errdefs/grpc.go delete mode 100644 vendor/github.com/docker/distribution/registry/api/errcode/errors.go delete mode 100644 vendor/github.com/docker/distribution/registry/api/errcode/handler.go delete mode 100644 vendor/github.com/docker/distribution/registry/api/errcode/register.go delete mode 100644 vendor/github.com/docker/docker/api/types/container/container_wait.go create mode 100644 vendor/github.com/docker/docker/api/types/container/container_wait_o_k_body.go create mode 100644 vendor/github.com/docker/docker/api/types/container/container_wait_o_k_body_error.go delete mode 100644 vendor/github.com/docker/docker/api/types/volume/volume_create.go create mode 100644 vendor/github.com/docker/docker/api/types/volume/volume_create_body.go create mode 100644 vendor/github.com/docker/docker/client/envvars.go create mode 100644 vendor/github.com/gogo/protobuf/protobuf/Makefile create mode 100644 vendor/github.com/gogo/protobuf/protobuf/google/protobuf/any.proto create mode 100644 vendor/github.com/gogo/protobuf/protobuf/google/protobuf/api.proto create mode 100644 vendor/github.com/gogo/protobuf/protobuf/google/protobuf/compiler/plugin.proto create mode 100644 vendor/github.com/gogo/protobuf/protobuf/google/protobuf/descriptor.proto create mode 100644 vendor/github.com/gogo/protobuf/protobuf/google/protobuf/duration.proto create mode 100644 vendor/github.com/gogo/protobuf/protobuf/google/protobuf/empty.proto create mode 100644 vendor/github.com/gogo/protobuf/protobuf/google/protobuf/field_mask.proto create mode 100644 vendor/github.com/gogo/protobuf/protobuf/google/protobuf/source_context.proto create mode 100644 vendor/github.com/gogo/protobuf/protobuf/google/protobuf/struct.proto create mode 100644 vendor/github.com/gogo/protobuf/protobuf/google/protobuf/timestamp.proto create mode 100644 vendor/github.com/gogo/protobuf/protobuf/google/protobuf/type.proto create mode 100644 vendor/github.com/gogo/protobuf/protobuf/google/protobuf/wrappers.proto diff --git a/.gitattributes b/.gitattributes deleted file mode 100644 index e2ec72d488..0000000000 --- a/.gitattributes +++ /dev/null @@ -1,2 +0,0 @@ -vendor.mod linguist-language=Go-Module -vendor.sum linguist-language=Go-Checksums diff --git a/.gitignore b/.gitignore index 4f0e3ec189..097fd203b0 100644 --- a/.gitignore +++ b/.gitignore @@ -34,6 +34,3 @@ bin/swarmkitstate # dev sync, if used /.docker-sync/ - -# top-level go.mod is not meant to be checked in yet -/go.mod diff --git a/BUILDING.md b/BUILDING.md index d04689afa1..543e679d52 100644 --- a/BUILDING.md +++ b/BUILDING.md @@ -80,7 +80,7 @@ for details. ### Update vendored dependencies -To update dependency you need just change `vendor.mod` file and run: +To update dependency you need just change `go.mod` file and run: ``` make go-mod-vendor ``` diff --git a/Dockerfile b/Dockerfile index 5eed82185f..732c27034f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,7 +16,7 @@ RUN curl --silent --show-error --location --output protoc.zip \ && unzip -d /usr/local protoc.zip include/\* bin/\* \ && rm -f protoc.zip -ENV GO111MODULE=off +ENV GO111MODULE=on WORKDIR /go/src/github.com/docker/swarmkit/ # install the dependencies from `make setup` diff --git a/Makefile b/Makefile index c940d00919..7449f60113 100644 --- a/Makefile +++ b/Makefile @@ -1,8 +1,6 @@ # Root directory of the project (absolute path). ROOTDIR=$(dir $(abspath $(lastword $(MAKEFILE_LIST)))) -PROJECT_ROOT=github.com/docker/swarmkit - SHELL := /bin/bash # stop here. do we want to run everything inside of a container, or do we want diff --git a/agent/agent.go b/agent/agent.go index 65b03b13e5..60df8a602c 100644 --- a/agent/agent.go +++ b/agent/agent.go @@ -8,9 +8,9 @@ import ( "sync" "time" - "github.com/docker/swarmkit/agent/exec" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/log" + "github.com/moby/swarmkit/v2/agent/exec" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/log" "github.com/pkg/errors" ) diff --git a/agent/agent_test.go b/agent/agent_test.go index 0522b5bb88..f514f757d6 100644 --- a/agent/agent_test.go +++ b/agent/agent_test.go @@ -15,15 +15,15 @@ import ( "google.golang.org/grpc/credentials" events "github.com/docker/go-events" - agentutils "github.com/docker/swarmkit/agent/testutils" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/ca" - cautils "github.com/docker/swarmkit/ca/testutils" - "github.com/docker/swarmkit/connectionbroker" - "github.com/docker/swarmkit/log" - "github.com/docker/swarmkit/remotes" - "github.com/docker/swarmkit/testutils" - "github.com/docker/swarmkit/xnet" + agentutils "github.com/moby/swarmkit/v2/agent/testutils" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/ca" + cautils "github.com/moby/swarmkit/v2/ca/testutils" + "github.com/moby/swarmkit/v2/connectionbroker" + "github.com/moby/swarmkit/v2/log" + "github.com/moby/swarmkit/v2/remotes" + "github.com/moby/swarmkit/v2/testutils" + "github.com/moby/swarmkit/v2/xnet" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/agent/config.go b/agent/config.go index 13024439dd..3afb2383a5 100644 --- a/agent/config.go +++ b/agent/config.go @@ -2,9 +2,9 @@ package agent import ( "github.com/docker/go-events" - "github.com/docker/swarmkit/agent/exec" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/connectionbroker" + "github.com/moby/swarmkit/v2/agent/exec" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/connectionbroker" "github.com/pkg/errors" bolt "go.etcd.io/bbolt" "google.golang.org/grpc/credentials" diff --git a/agent/configs/configs.go b/agent/configs/configs.go index ae5fc8c18c..7d110cfc91 100644 --- a/agent/configs/configs.go +++ b/agent/configs/configs.go @@ -4,8 +4,8 @@ import ( "fmt" "sync" - "github.com/docker/swarmkit/agent/exec" - "github.com/docker/swarmkit/api" + "github.com/moby/swarmkit/v2/agent/exec" + "github.com/moby/swarmkit/v2/api" ) // configs is a map that keeps all the currently available configs to the agent diff --git a/agent/csi/plugin/manager.go b/agent/csi/plugin/manager.go index 3c155cb141..39bb60f450 100644 --- a/agent/csi/plugin/manager.go +++ b/agent/csi/plugin/manager.go @@ -7,7 +7,7 @@ import ( "github.com/docker/docker/pkg/plugingetter" - "github.com/docker/swarmkit/api" + "github.com/moby/swarmkit/v2/api" ) const ( diff --git a/agent/csi/plugin/manager_test.go b/agent/csi/plugin/manager_test.go index 7c52aa1f09..a0e94a310e 100644 --- a/agent/csi/plugin/manager_test.go +++ b/agent/csi/plugin/manager_test.go @@ -7,7 +7,7 @@ import ( . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" - "github.com/docker/swarmkit/testutils" + "github.com/moby/swarmkit/v2/testutils" ) var _ = Describe("PluginManager", func() { diff --git a/agent/csi/plugin/plugin.go b/agent/csi/plugin/plugin.go index f7f4f72107..543cb057c7 100644 --- a/agent/csi/plugin/plugin.go +++ b/agent/csi/plugin/plugin.go @@ -12,8 +12,8 @@ import ( "github.com/container-storage-interface/spec/lib/go/csi" "github.com/docker/docker/pkg/plugingetter" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/log" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/log" ) // SecretGetter is a reimplementation of the exec.SecretGetter interface in the diff --git a/agent/csi/plugin/plugin_fake_test.go b/agent/csi/plugin/plugin_fake_test.go index 37060ea125..8600a39e17 100644 --- a/agent/csi/plugin/plugin_fake_test.go +++ b/agent/csi/plugin/plugin_fake_test.go @@ -6,7 +6,7 @@ import ( "github.com/docker/docker/pkg/plugingetter" - "github.com/docker/swarmkit/api" + "github.com/moby/swarmkit/v2/api" ) // plugin_fake_test.go contains code for faking node plugins in the context of diff --git a/agent/csi/plugin/plugin_test.go b/agent/csi/plugin/plugin_test.go index c735999e3c..265dde0dc8 100644 --- a/agent/csi/plugin/plugin_test.go +++ b/agent/csi/plugin/plugin_test.go @@ -5,8 +5,8 @@ import ( "net" "testing" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/testutils" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/testutils" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/agent/csi/plugin_manager_fake_test.go b/agent/csi/plugin_manager_fake_test.go index a016c50e0e..4612628093 100644 --- a/agent/csi/plugin_manager_fake_test.go +++ b/agent/csi/plugin_manager_fake_test.go @@ -7,8 +7,8 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - "github.com/docker/swarmkit/agent/csi/plugin" - "github.com/docker/swarmkit/api" + "github.com/moby/swarmkit/v2/agent/csi/plugin" + "github.com/moby/swarmkit/v2/api" ) // fakePluginManager is a fake pluginManager, used for testing the volume diff --git a/agent/csi/volume_manager_test.go b/agent/csi/volume_manager_test.go index 6decb35de7..eea08090bb 100644 --- a/agent/csi/volume_manager_test.go +++ b/agent/csi/volume_manager_test.go @@ -6,9 +6,9 @@ import ( "testing" "time" - "github.com/docker/swarmkit/agent/exec" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/volumequeue" + "github.com/moby/swarmkit/v2/agent/exec" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/volumequeue" "github.com/stretchr/testify/assert" ) diff --git a/agent/csi/volumes.go b/agent/csi/volumes.go index ea436c8f85..c9c97a2ff0 100644 --- a/agent/csi/volumes.go +++ b/agent/csi/volumes.go @@ -9,11 +9,11 @@ import ( "github.com/docker/docker/pkg/plugingetter" - "github.com/docker/swarmkit/agent/csi/plugin" - "github.com/docker/swarmkit/agent/exec" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/log" - "github.com/docker/swarmkit/volumequeue" + "github.com/moby/swarmkit/v2/agent/csi/plugin" + "github.com/moby/swarmkit/v2/agent/exec" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/log" + "github.com/moby/swarmkit/v2/volumequeue" ) // volumeState keeps track of the state of a volume on this node. diff --git a/agent/dependency.go b/agent/dependency.go index 143f61e386..d123e30a1b 100644 --- a/agent/dependency.go +++ b/agent/dependency.go @@ -3,11 +3,11 @@ package agent import ( "github.com/docker/docker/pkg/plugingetter" - "github.com/docker/swarmkit/agent/configs" - "github.com/docker/swarmkit/agent/csi" - "github.com/docker/swarmkit/agent/exec" - "github.com/docker/swarmkit/agent/secrets" - "github.com/docker/swarmkit/api" + "github.com/moby/swarmkit/v2/agent/configs" + "github.com/moby/swarmkit/v2/agent/csi" + "github.com/moby/swarmkit/v2/agent/exec" + "github.com/moby/swarmkit/v2/agent/secrets" + "github.com/moby/swarmkit/v2/api" ) type dependencyManager struct { diff --git a/agent/exec/controller.go b/agent/exec/controller.go index b617d37ca3..3c63ed640d 100644 --- a/agent/exec/controller.go +++ b/agent/exec/controller.go @@ -5,10 +5,10 @@ import ( "fmt" "time" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/api/equality" - "github.com/docker/swarmkit/log" - "github.com/docker/swarmkit/protobuf/ptypes" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/api/equality" + "github.com/moby/swarmkit/v2/log" + "github.com/moby/swarmkit/v2/protobuf/ptypes" "github.com/pkg/errors" "github.com/sirupsen/logrus" ) diff --git a/agent/exec/controller_stub.go b/agent/exec/controller_stub.go index dd16ce457d..6775779e59 100644 --- a/agent/exec/controller_stub.go +++ b/agent/exec/controller_stub.go @@ -5,7 +5,7 @@ import ( "runtime" "strings" - "github.com/docker/swarmkit/api" + "github.com/moby/swarmkit/v2/api" ) // StubController implements the Controller interface, diff --git a/agent/exec/controller_test.go b/agent/exec/controller_test.go index 62d0b257d3..59afadaf7b 100644 --- a/agent/exec/controller_test.go +++ b/agent/exec/controller_test.go @@ -7,8 +7,8 @@ import ( "runtime" "testing" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/log" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/log" gogotypes "github.com/gogo/protobuf/types" "github.com/stretchr/testify/assert" ) diff --git a/agent/exec/dockerapi/adapter.go b/agent/exec/dockerapi/adapter.go index 2356c130ee..ccb9774efc 100644 --- a/agent/exec/dockerapi/adapter.go +++ b/agent/exec/dockerapi/adapter.go @@ -11,9 +11,9 @@ import ( "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/events" engineapi "github.com/docker/docker/client" - "github.com/docker/swarmkit/agent/exec" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/log" + "github.com/moby/swarmkit/v2/agent/exec" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/log" gogotypes "github.com/gogo/protobuf/types" "github.com/pkg/errors" "github.com/sirupsen/logrus" diff --git a/agent/exec/dockerapi/container.go b/agent/exec/dockerapi/container.go index c76e3364c7..4732a2cba8 100644 --- a/agent/exec/dockerapi/container.go +++ b/agent/exec/dockerapi/container.go @@ -17,11 +17,11 @@ import ( "github.com/docker/docker/api/types/volume" "github.com/docker/go-connections/nat" "github.com/docker/go-units" - "github.com/docker/swarmkit/agent/exec" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/api/genericresource" - "github.com/docker/swarmkit/api/naming" - "github.com/docker/swarmkit/template" + "github.com/moby/swarmkit/v2/agent/exec" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/api/genericresource" + "github.com/moby/swarmkit/v2/api/naming" + "github.com/moby/swarmkit/v2/template" gogotypes "github.com/gogo/protobuf/types" ) diff --git a/agent/exec/dockerapi/container_test.go b/agent/exec/dockerapi/container_test.go index d9b6792d18..5c0170d896 100644 --- a/agent/exec/dockerapi/container_test.go +++ b/agent/exec/dockerapi/container_test.go @@ -9,7 +9,7 @@ import ( enginemount "github.com/docker/docker/api/types/mount" "github.com/docker/docker/api/types/strslice" "github.com/docker/go-units" - "github.com/docker/swarmkit/api" + "github.com/moby/swarmkit/v2/api" gogotypes "github.com/gogo/protobuf/types" ) diff --git a/agent/exec/dockerapi/controller.go b/agent/exec/dockerapi/controller.go index abb2e15e90..07c1db6ce6 100644 --- a/agent/exec/dockerapi/controller.go +++ b/agent/exec/dockerapi/controller.go @@ -15,9 +15,9 @@ import ( "github.com/docker/docker/api/types/events" engineapi "github.com/docker/docker/client" "github.com/docker/go-connections/nat" - "github.com/docker/swarmkit/agent/exec" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/log" + "github.com/moby/swarmkit/v2/agent/exec" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/log" gogotypes "github.com/gogo/protobuf/types" "github.com/pkg/errors" "golang.org/x/time/rate" diff --git a/agent/exec/dockerapi/controller_integration_test.go b/agent/exec/dockerapi/controller_integration_test.go index 7e766e051a..e2a24028b4 100644 --- a/agent/exec/dockerapi/controller_integration_test.go +++ b/agent/exec/dockerapi/controller_integration_test.go @@ -6,9 +6,9 @@ import ( "testing" engineapi "github.com/docker/docker/client" - "github.com/docker/swarmkit/agent/exec" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/api/genericresource" + "github.com/moby/swarmkit/v2/agent/exec" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/api/genericresource" "github.com/stretchr/testify/assert" ) diff --git a/agent/exec/dockerapi/controller_test.go b/agent/exec/dockerapi/controller_test.go index b08e6910ad..b4844e518d 100644 --- a/agent/exec/dockerapi/controller_test.go +++ b/agent/exec/dockerapi/controller_test.go @@ -16,10 +16,10 @@ import ( containertypes "github.com/docker/docker/api/types/container" "github.com/docker/docker/api/types/events" "github.com/docker/docker/api/types/network" - "github.com/docker/swarmkit/agent/exec" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/identity" - "github.com/docker/swarmkit/log" + "github.com/moby/swarmkit/v2/agent/exec" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/identity" + "github.com/moby/swarmkit/v2/log" gogotypes "github.com/gogo/protobuf/types" "github.com/stretchr/testify/assert" ) diff --git a/agent/exec/dockerapi/executor.go b/agent/exec/dockerapi/executor.go index 011164596c..f66d03c86e 100644 --- a/agent/exec/dockerapi/executor.go +++ b/agent/exec/dockerapi/executor.go @@ -8,10 +8,10 @@ import ( "github.com/docker/docker/api/types/filters" engineapi "github.com/docker/docker/client" - "github.com/docker/swarmkit/agent/exec" - "github.com/docker/swarmkit/agent/secrets" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/log" + "github.com/moby/swarmkit/v2/agent/exec" + "github.com/moby/swarmkit/v2/agent/secrets" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/log" ) type executor struct { diff --git a/agent/exec/executor.go b/agent/exec/executor.go index 36f3bc6021..61a305aec6 100644 --- a/agent/exec/executor.go +++ b/agent/exec/executor.go @@ -3,7 +3,7 @@ package exec import ( "context" - "github.com/docker/swarmkit/api" + "github.com/moby/swarmkit/v2/api" ) // Executor provides controllers for tasks. diff --git a/agent/reporter.go b/agent/reporter.go index abd3c890a6..db7456c3b7 100644 --- a/agent/reporter.go +++ b/agent/reporter.go @@ -5,8 +5,8 @@ import ( "reflect" "sync" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/log" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/log" ) // StatusReporter receives updates to task status. Method may be called diff --git a/agent/reporter_test.go b/agent/reporter_test.go index 943fa2ae9d..a2440a2688 100644 --- a/agent/reporter_test.go +++ b/agent/reporter_test.go @@ -8,7 +8,7 @@ import ( "sync" "testing" - "github.com/docker/swarmkit/api" + "github.com/moby/swarmkit/v2/api" "github.com/stretchr/testify/assert" ) diff --git a/agent/resource.go b/agent/resource.go index 32be069c11..5d4dc84fc6 100644 --- a/agent/resource.go +++ b/agent/resource.go @@ -3,7 +3,7 @@ package agent import ( "context" - "github.com/docker/swarmkit/api" + "github.com/moby/swarmkit/v2/api" ) type resourceAllocator struct { diff --git a/agent/secrets/secrets.go b/agent/secrets/secrets.go index fb0ee1d3b9..742d116aa4 100644 --- a/agent/secrets/secrets.go +++ b/agent/secrets/secrets.go @@ -4,9 +4,9 @@ import ( "fmt" "sync" - "github.com/docker/swarmkit/agent/exec" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/identity" + "github.com/moby/swarmkit/v2/agent/exec" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/identity" ) // secrets is a map that keeps all the currently available secrets to the agent diff --git a/agent/secrets/secrets_test.go b/agent/secrets/secrets_test.go index e15fffb8d2..810c136a10 100644 --- a/agent/secrets/secrets_test.go +++ b/agent/secrets/secrets_test.go @@ -6,9 +6,9 @@ import ( "github.com/stretchr/testify/require" - "github.com/docker/swarmkit/agent/exec" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/identity" + "github.com/moby/swarmkit/v2/agent/exec" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/identity" "github.com/stretchr/testify/assert" ) diff --git a/agent/session.go b/agent/session.go index 240ce8079c..97d5621eb9 100644 --- a/agent/session.go +++ b/agent/session.go @@ -7,9 +7,9 @@ import ( "sync" "time" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/connectionbroker" - "github.com/docker/swarmkit/log" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/connectionbroker" + "github.com/moby/swarmkit/v2/log" "github.com/sirupsen/logrus" "google.golang.org/grpc" "google.golang.org/grpc/codes" diff --git a/agent/storage.go b/agent/storage.go index 8d32ebf1ba..3be91e143b 100644 --- a/agent/storage.go +++ b/agent/storage.go @@ -1,7 +1,7 @@ package agent import ( - "github.com/docker/swarmkit/api" + "github.com/moby/swarmkit/v2/api" "github.com/gogo/protobuf/proto" bolt "go.etcd.io/bbolt" ) diff --git a/agent/storage_test.go b/agent/storage_test.go index 90f603b160..8cb3c24ebb 100644 --- a/agent/storage_test.go +++ b/agent/storage_test.go @@ -7,8 +7,8 @@ import ( "sort" "testing" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/identity" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/identity" "github.com/stretchr/testify/assert" bolt "go.etcd.io/bbolt" ) diff --git a/agent/task.go b/agent/task.go index 17c713c092..a000410445 100644 --- a/agent/task.go +++ b/agent/task.go @@ -5,10 +5,10 @@ import ( "sync" "time" - "github.com/docker/swarmkit/agent/exec" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/api/equality" - "github.com/docker/swarmkit/log" + "github.com/moby/swarmkit/v2/agent/exec" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/api/equality" + "github.com/moby/swarmkit/v2/log" ) // taskManager manages all aspects of task execution and reporting for an agent diff --git a/agent/task_test.go b/agent/task_test.go index 85b83ddba2..8b8d778f9d 100644 --- a/agent/task_test.go +++ b/agent/task_test.go @@ -5,8 +5,8 @@ import ( "testing" "time" - "github.com/docker/swarmkit/agent/exec" - "github.com/docker/swarmkit/api" + "github.com/moby/swarmkit/v2/agent/exec" + "github.com/moby/swarmkit/v2/api" "github.com/sirupsen/logrus" "github.com/stretchr/testify/assert" ) diff --git a/agent/testutils/fakes.go b/agent/testutils/fakes.go index 1717c79630..d1d3b309a1 100644 --- a/agent/testutils/fakes.go +++ b/agent/testutils/fakes.go @@ -11,11 +11,11 @@ import ( "google.golang.org/grpc" - "github.com/docker/swarmkit/agent/exec" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/ca" - "github.com/docker/swarmkit/identity" - "github.com/docker/swarmkit/log" + "github.com/moby/swarmkit/v2/agent/exec" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/ca" + "github.com/moby/swarmkit/v2/identity" + "github.com/moby/swarmkit/v2/log" "github.com/stretchr/testify/require" ) diff --git a/agent/worker.go b/agent/worker.go index 27df5002a3..ad51aa716e 100644 --- a/agent/worker.go +++ b/agent/worker.go @@ -4,10 +4,10 @@ import ( "context" "sync" - "github.com/docker/swarmkit/agent/exec" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/log" - "github.com/docker/swarmkit/watch" + "github.com/moby/swarmkit/v2/agent/exec" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/log" + "github.com/moby/swarmkit/v2/watch" "github.com/sirupsen/logrus" bolt "go.etcd.io/bbolt" ) diff --git a/agent/worker_test.go b/agent/worker_test.go index e90356ed7a..e5bb684481 100644 --- a/agent/worker_test.go +++ b/agent/worker_test.go @@ -6,10 +6,10 @@ import ( "net" "testing" - "github.com/docker/swarmkit/agent/exec" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/log" - "github.com/docker/swarmkit/testutils" + "github.com/moby/swarmkit/v2/agent/exec" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/log" + "github.com/moby/swarmkit/v2/testutils" "github.com/sirupsen/logrus" "github.com/stretchr/testify/assert" bolt "go.etcd.io/bbolt" diff --git a/api/api.pb.txt b/api/api.pb.txt index e2ddb07d14..905338f864 100755 --- a/api/api.pb.txt +++ b/api/api.pb.txt @@ -2735,8 +2735,8 @@ file { label: LABEL_OPTIONAL type: TYPE_UINT32 options { - 65001: 0 65003: "os.FileMode" + 65001: 0 } json_name: "mode" } @@ -2904,8 +2904,8 @@ file { type: TYPE_MESSAGE type_name: ".google.protobuf.Duration" options { - 65001: 0 65011: 1 + 65001: 0 } json_name: "delay" } @@ -3348,8 +3348,8 @@ file { } } options { - 62001: 0 62023: "PublishMode" + 62001: 0 } } } @@ -4055,8 +4055,8 @@ file { label: LABEL_OPTIONAL type: TYPE_UINT32 options { - 65001: 0 65003: "os.FileMode" + 65001: 0 } json_name: "mode" } @@ -5052,8 +5052,8 @@ file { } } options { - 62001: 0 62023: "NodeRole" + 62001: 0 } } syntax: "proto3" @@ -9739,8 +9739,8 @@ file { type: TYPE_MESSAGE type_name: ".google.protobuf.Duration" options { - 65001: 0 65011: 1 + 65001: 0 } json_name: "period" } @@ -10958,14 +10958,14 @@ file { } } options { - 63001: 0 - 63002: 0 63017: 1 - 63018: 1 63020: 1 + 63018: 1 + 63001: 0 + 63002: 0 + 63035: 0 63026: 0 63034: 0 - 63035: 0 } } file { diff --git a/api/ca.pb.go b/api/ca.pb.go index e37dbc97a2..ab91ef725f 100644 --- a/api/ca.pb.go +++ b/api/ca.pb.go @@ -6,11 +6,11 @@ package api import ( context "context" fmt "fmt" - github_com_docker_swarmkit_api_deepcopy "github.com/docker/swarmkit/api/deepcopy" - raftselector "github.com/docker/swarmkit/manager/raftselector" _ "github.com/docker/swarmkit/protobuf/plugin" _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" + github_com_moby_swarmkit_v2_api_deepcopy "github.com/moby/swarmkit/v2/api/deepcopy" + raftselector "github.com/moby/swarmkit/v2/manager/raftselector" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" metadata "google.golang.org/grpc/metadata" @@ -469,11 +469,11 @@ func (m *NodeCertificateStatusResponse) CopyFrom(src interface{}) { *m = *o if o.Status != nil { m.Status = &IssuanceStatus{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Status, o.Status) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Status, o.Status) } if o.Certificate != nil { m.Certificate = &Certificate{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Certificate, o.Certificate) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Certificate, o.Certificate) } } @@ -567,7 +567,7 @@ func (m *GetUnlockKeyResponse) CopyFrom(src interface{}) { m.UnlockKey = make([]byte, len(o.UnlockKey)) copy(m.UnlockKey, o.UnlockKey) } - github_com_docker_swarmkit_api_deepcopy.Copy(&m.Version, &o.Version) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(&m.Version, &o.Version) } // Reference imports to suppress errors if they are not otherwise used. diff --git a/api/control.pb.go b/api/control.pb.go index 38f1c009bc..4e13d6fb96 100644 --- a/api/control.pb.go +++ b/api/control.pb.go @@ -6,13 +6,13 @@ package api import ( context "context" fmt "fmt" - github_com_docker_swarmkit_api_deepcopy "github.com/docker/swarmkit/api/deepcopy" - raftselector "github.com/docker/swarmkit/manager/raftselector" _ "github.com/docker/swarmkit/protobuf/plugin" _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" github_com_gogo_protobuf_sortkeys "github.com/gogo/protobuf/sortkeys" types "github.com/gogo/protobuf/types" + github_com_moby_swarmkit_v2_api_deepcopy "github.com/moby/swarmkit/v2/api/deepcopy" + raftselector "github.com/moby/swarmkit/v2/manager/raftselector" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" metadata "google.golang.org/grpc/metadata" @@ -4436,7 +4436,7 @@ func (m *GetNodeResponse) CopyFrom(src interface{}) { *m = *o if o.Node != nil { m.Node = &Node{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Node, o.Node) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Node, o.Node) } } @@ -4455,7 +4455,7 @@ func (m *ListNodesRequest) CopyFrom(src interface{}) { *m = *o if o.Filters != nil { m.Filters = &ListNodesRequest_Filters{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Filters, o.Filters) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Filters, o.Filters) } } @@ -4530,7 +4530,7 @@ func (m *ListNodesResponse) CopyFrom(src interface{}) { m.Nodes = make([]*Node, len(o.Nodes)) for i := range m.Nodes { m.Nodes[i] = &Node{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Nodes[i], o.Nodes[i]) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Nodes[i], o.Nodes[i]) } } @@ -4551,11 +4551,11 @@ func (m *UpdateNodeRequest) CopyFrom(src interface{}) { *m = *o if o.NodeVersion != nil { m.NodeVersion = &Version{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.NodeVersion, o.NodeVersion) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.NodeVersion, o.NodeVersion) } if o.Spec != nil { m.Spec = &NodeSpec{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Spec, o.Spec) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Spec, o.Spec) } } @@ -4574,7 +4574,7 @@ func (m *UpdateNodeResponse) CopyFrom(src interface{}) { *m = *o if o.Node != nil { m.Node = &Node{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Node, o.Node) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Node, o.Node) } } @@ -4633,7 +4633,7 @@ func (m *GetTaskResponse) CopyFrom(src interface{}) { *m = *o if o.Task != nil { m.Task = &Task{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Task, o.Task) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Task, o.Task) } } @@ -4677,7 +4677,7 @@ func (m *ListTasksRequest) CopyFrom(src interface{}) { *m = *o if o.Filters != nil { m.Filters = &ListTasksRequest_Filters{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Filters, o.Filters) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Filters, o.Filters) } } @@ -4755,7 +4755,7 @@ func (m *ListTasksResponse) CopyFrom(src interface{}) { m.Tasks = make([]*Task, len(o.Tasks)) for i := range m.Tasks { m.Tasks[i] = &Task{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Tasks[i], o.Tasks[i]) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Tasks[i], o.Tasks[i]) } } @@ -4776,7 +4776,7 @@ func (m *CreateServiceRequest) CopyFrom(src interface{}) { *m = *o if o.Spec != nil { m.Spec = &ServiceSpec{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Spec, o.Spec) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Spec, o.Spec) } } @@ -4795,7 +4795,7 @@ func (m *CreateServiceResponse) CopyFrom(src interface{}) { *m = *o if o.Service != nil { m.Service = &Service{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Service, o.Service) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Service, o.Service) } } @@ -4829,7 +4829,7 @@ func (m *GetServiceResponse) CopyFrom(src interface{}) { *m = *o if o.Service != nil { m.Service = &Service{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Service, o.Service) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Service, o.Service) } } @@ -4848,11 +4848,11 @@ func (m *UpdateServiceRequest) CopyFrom(src interface{}) { *m = *o if o.ServiceVersion != nil { m.ServiceVersion = &Version{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.ServiceVersion, o.ServiceVersion) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.ServiceVersion, o.ServiceVersion) } if o.Spec != nil { m.Spec = &ServiceSpec{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Spec, o.Spec) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Spec, o.Spec) } } @@ -4871,7 +4871,7 @@ func (m *UpdateServiceResponse) CopyFrom(src interface{}) { *m = *o if o.Service != nil { m.Service = &Service{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Service, o.Service) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Service, o.Service) } } @@ -4915,7 +4915,7 @@ func (m *ListServicesRequest) CopyFrom(src interface{}) { *m = *o if o.Filters != nil { m.Filters = &ListServicesRequest_Filters{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Filters, o.Filters) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Filters, o.Filters) } } @@ -4978,7 +4978,7 @@ func (m *ListServicesResponse) CopyFrom(src interface{}) { m.Services = make([]*Service, len(o.Services)) for i := range m.Services { m.Services[i] = &Service{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Services[i], o.Services[i]) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Services[i], o.Services[i]) } } @@ -5021,7 +5021,7 @@ func (m *ListServiceStatusesResponse) CopyFrom(src interface{}) { m.Statuses = make([]*ListServiceStatusesResponse_ServiceStatus, len(o.Statuses)) for i := range m.Statuses { m.Statuses[i] = &ListServiceStatusesResponse_ServiceStatus{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Statuses[i], o.Statuses[i]) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Statuses[i], o.Statuses[i]) } } @@ -5057,7 +5057,7 @@ func (m *CreateNetworkRequest) CopyFrom(src interface{}) { *m = *o if o.Spec != nil { m.Spec = &NetworkSpec{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Spec, o.Spec) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Spec, o.Spec) } } @@ -5076,7 +5076,7 @@ func (m *CreateNetworkResponse) CopyFrom(src interface{}) { *m = *o if o.Network != nil { m.Network = &Network{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Network, o.Network) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Network, o.Network) } } @@ -5110,7 +5110,7 @@ func (m *GetNetworkResponse) CopyFrom(src interface{}) { *m = *o if o.Network != nil { m.Network = &Network{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Network, o.Network) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Network, o.Network) } } @@ -5154,7 +5154,7 @@ func (m *ListNetworksRequest) CopyFrom(src interface{}) { *m = *o if o.Filters != nil { m.Filters = &ListNetworksRequest_Filters{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Filters, o.Filters) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Filters, o.Filters) } } @@ -5212,7 +5212,7 @@ func (m *ListNetworksResponse) CopyFrom(src interface{}) { m.Networks = make([]*Network, len(o.Networks)) for i := range m.Networks { m.Networks[i] = &Network{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Networks[i], o.Networks[i]) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Networks[i], o.Networks[i]) } } @@ -5248,7 +5248,7 @@ func (m *GetClusterResponse) CopyFrom(src interface{}) { *m = *o if o.Cluster != nil { m.Cluster = &Cluster{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Cluster, o.Cluster) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Cluster, o.Cluster) } } @@ -5267,7 +5267,7 @@ func (m *ListClustersRequest) CopyFrom(src interface{}) { *m = *o if o.Filters != nil { m.Filters = &ListClustersRequest_Filters{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Filters, o.Filters) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Filters, o.Filters) } } @@ -5325,7 +5325,7 @@ func (m *ListClustersResponse) CopyFrom(src interface{}) { m.Clusters = make([]*Cluster, len(o.Clusters)) for i := range m.Clusters { m.Clusters[i] = &Cluster{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Clusters[i], o.Clusters[i]) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Clusters[i], o.Clusters[i]) } } @@ -5361,13 +5361,13 @@ func (m *UpdateClusterRequest) CopyFrom(src interface{}) { *m = *o if o.ClusterVersion != nil { m.ClusterVersion = &Version{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.ClusterVersion, o.ClusterVersion) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.ClusterVersion, o.ClusterVersion) } if o.Spec != nil { m.Spec = &ClusterSpec{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Spec, o.Spec) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Spec, o.Spec) } - github_com_docker_swarmkit_api_deepcopy.Copy(&m.Rotation, &o.Rotation) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(&m.Rotation, &o.Rotation) } func (m *UpdateClusterResponse) Copy() *UpdateClusterResponse { @@ -5385,7 +5385,7 @@ func (m *UpdateClusterResponse) CopyFrom(src interface{}) { *m = *o if o.Cluster != nil { m.Cluster = &Cluster{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Cluster, o.Cluster) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Cluster, o.Cluster) } } @@ -5419,7 +5419,7 @@ func (m *GetSecretResponse) CopyFrom(src interface{}) { *m = *o if o.Secret != nil { m.Secret = &Secret{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Secret, o.Secret) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Secret, o.Secret) } } @@ -5438,11 +5438,11 @@ func (m *UpdateSecretRequest) CopyFrom(src interface{}) { *m = *o if o.SecretVersion != nil { m.SecretVersion = &Version{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.SecretVersion, o.SecretVersion) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.SecretVersion, o.SecretVersion) } if o.Spec != nil { m.Spec = &SecretSpec{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Spec, o.Spec) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Spec, o.Spec) } } @@ -5461,7 +5461,7 @@ func (m *UpdateSecretResponse) CopyFrom(src interface{}) { *m = *o if o.Secret != nil { m.Secret = &Secret{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Secret, o.Secret) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Secret, o.Secret) } } @@ -5480,7 +5480,7 @@ func (m *ListSecretsRequest) CopyFrom(src interface{}) { *m = *o if o.Filters != nil { m.Filters = &ListSecretsRequest_Filters{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Filters, o.Filters) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Filters, o.Filters) } } @@ -5538,7 +5538,7 @@ func (m *ListSecretsResponse) CopyFrom(src interface{}) { m.Secrets = make([]*Secret, len(o.Secrets)) for i := range m.Secrets { m.Secrets[i] = &Secret{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Secrets[i], o.Secrets[i]) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Secrets[i], o.Secrets[i]) } } @@ -5559,7 +5559,7 @@ func (m *CreateSecretRequest) CopyFrom(src interface{}) { *m = *o if o.Spec != nil { m.Spec = &SecretSpec{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Spec, o.Spec) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Spec, o.Spec) } } @@ -5578,7 +5578,7 @@ func (m *CreateSecretResponse) CopyFrom(src interface{}) { *m = *o if o.Secret != nil { m.Secret = &Secret{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Secret, o.Secret) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Secret, o.Secret) } } @@ -5637,7 +5637,7 @@ func (m *GetConfigResponse) CopyFrom(src interface{}) { *m = *o if o.Config != nil { m.Config = &Config{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Config, o.Config) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Config, o.Config) } } @@ -5656,11 +5656,11 @@ func (m *UpdateConfigRequest) CopyFrom(src interface{}) { *m = *o if o.ConfigVersion != nil { m.ConfigVersion = &Version{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.ConfigVersion, o.ConfigVersion) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.ConfigVersion, o.ConfigVersion) } if o.Spec != nil { m.Spec = &ConfigSpec{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Spec, o.Spec) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Spec, o.Spec) } } @@ -5679,7 +5679,7 @@ func (m *UpdateConfigResponse) CopyFrom(src interface{}) { *m = *o if o.Config != nil { m.Config = &Config{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Config, o.Config) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Config, o.Config) } } @@ -5698,7 +5698,7 @@ func (m *ListConfigsRequest) CopyFrom(src interface{}) { *m = *o if o.Filters != nil { m.Filters = &ListConfigsRequest_Filters{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Filters, o.Filters) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Filters, o.Filters) } } @@ -5756,7 +5756,7 @@ func (m *ListConfigsResponse) CopyFrom(src interface{}) { m.Configs = make([]*Config, len(o.Configs)) for i := range m.Configs { m.Configs[i] = &Config{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Configs[i], o.Configs[i]) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Configs[i], o.Configs[i]) } } @@ -5777,7 +5777,7 @@ func (m *CreateConfigRequest) CopyFrom(src interface{}) { *m = *o if o.Spec != nil { m.Spec = &ConfigSpec{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Spec, o.Spec) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Spec, o.Spec) } } @@ -5796,7 +5796,7 @@ func (m *CreateConfigResponse) CopyFrom(src interface{}) { *m = *o if o.Config != nil { m.Config = &Config{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Config, o.Config) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Config, o.Config) } } @@ -5840,7 +5840,7 @@ func (m *CreateExtensionRequest) CopyFrom(src interface{}) { *m = *o if o.Annotations != nil { m.Annotations = &Annotations{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Annotations, o.Annotations) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Annotations, o.Annotations) } } @@ -5859,7 +5859,7 @@ func (m *CreateExtensionResponse) CopyFrom(src interface{}) { *m = *o if o.Extension != nil { m.Extension = &Extension{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Extension, o.Extension) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Extension, o.Extension) } } @@ -5918,7 +5918,7 @@ func (m *GetExtensionResponse) CopyFrom(src interface{}) { *m = *o if o.Extension != nil { m.Extension = &Extension{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Extension, o.Extension) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Extension, o.Extension) } } @@ -5937,11 +5937,11 @@ func (m *CreateResourceRequest) CopyFrom(src interface{}) { *m = *o if o.Annotations != nil { m.Annotations = &Annotations{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Annotations, o.Annotations) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Annotations, o.Annotations) } if o.Payload != nil { m.Payload = &types.Any{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Payload, o.Payload) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Payload, o.Payload) } } @@ -5960,7 +5960,7 @@ func (m *CreateResourceResponse) CopyFrom(src interface{}) { *m = *o if o.Resource != nil { m.Resource = &Resource{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Resource, o.Resource) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Resource, o.Resource) } } @@ -6004,15 +6004,15 @@ func (m *UpdateResourceRequest) CopyFrom(src interface{}) { *m = *o if o.ResourceVersion != nil { m.ResourceVersion = &Version{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.ResourceVersion, o.ResourceVersion) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.ResourceVersion, o.ResourceVersion) } if o.Annotations != nil { m.Annotations = &Annotations{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Annotations, o.Annotations) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Annotations, o.Annotations) } if o.Payload != nil { m.Payload = &types.Any{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Payload, o.Payload) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Payload, o.Payload) } } @@ -6031,7 +6031,7 @@ func (m *UpdateResourceResponse) CopyFrom(src interface{}) { *m = *o if o.Resource != nil { m.Resource = &Resource{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Resource, o.Resource) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Resource, o.Resource) } } @@ -6065,7 +6065,7 @@ func (m *GetResourceResponse) CopyFrom(src interface{}) { *m = *o if o.Resource != nil { m.Resource = &Resource{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Resource, o.Resource) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Resource, o.Resource) } } @@ -6084,7 +6084,7 @@ func (m *ListResourcesRequest) CopyFrom(src interface{}) { *m = *o if o.Filters != nil { m.Filters = &ListResourcesRequest_Filters{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Filters, o.Filters) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Filters, o.Filters) } } @@ -6142,7 +6142,7 @@ func (m *ListResourcesResponse) CopyFrom(src interface{}) { m.Resources = make([]*Resource, len(o.Resources)) for i := range m.Resources { m.Resources[i] = &Resource{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Resources[i], o.Resources[i]) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Resources[i], o.Resources[i]) } } @@ -6163,7 +6163,7 @@ func (m *CreateVolumeRequest) CopyFrom(src interface{}) { *m = *o if o.Spec != nil { m.Spec = &VolumeSpec{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Spec, o.Spec) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Spec, o.Spec) } } @@ -6182,7 +6182,7 @@ func (m *CreateVolumeResponse) CopyFrom(src interface{}) { *m = *o if o.Volume != nil { m.Volume = &Volume{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Volume, o.Volume) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Volume, o.Volume) } } @@ -6216,7 +6216,7 @@ func (m *GetVolumeResponse) CopyFrom(src interface{}) { *m = *o if o.Volume != nil { m.Volume = &Volume{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Volume, o.Volume) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Volume, o.Volume) } } @@ -6235,11 +6235,11 @@ func (m *UpdateVolumeRequest) CopyFrom(src interface{}) { *m = *o if o.VolumeVersion != nil { m.VolumeVersion = &Version{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.VolumeVersion, o.VolumeVersion) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.VolumeVersion, o.VolumeVersion) } if o.Spec != nil { m.Spec = &VolumeSpec{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Spec, o.Spec) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Spec, o.Spec) } } @@ -6258,7 +6258,7 @@ func (m *UpdateVolumeResponse) CopyFrom(src interface{}) { *m = *o if o.Volume != nil { m.Volume = &Volume{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Volume, o.Volume) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Volume, o.Volume) } } @@ -6277,7 +6277,7 @@ func (m *ListVolumesRequest) CopyFrom(src interface{}) { *m = *o if o.Filters != nil { m.Filters = &ListVolumesRequest_Filters{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Filters, o.Filters) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Filters, o.Filters) } } @@ -6345,7 +6345,7 @@ func (m *ListVolumesResponse) CopyFrom(src interface{}) { m.Volumes = make([]*Volume, len(o.Volumes)) for i := range m.Volumes { m.Volumes[i] = &Volume{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Volumes[i], o.Volumes[i]) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Volumes[i], o.Volumes[i]) } } diff --git a/api/defaults/service.go b/api/defaults/service.go index ce1e86435a..461378ffca 100644 --- a/api/defaults/service.go +++ b/api/defaults/service.go @@ -3,8 +3,8 @@ package defaults import ( "time" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/api/deepcopy" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/api/deepcopy" gogotypes "github.com/gogo/protobuf/types" ) diff --git a/api/dispatcher.pb.go b/api/dispatcher.pb.go index 7bde892fc2..4db6887da6 100644 --- a/api/dispatcher.pb.go +++ b/api/dispatcher.pb.go @@ -6,13 +6,13 @@ package api import ( context "context" fmt "fmt" - github_com_docker_swarmkit_api_deepcopy "github.com/docker/swarmkit/api/deepcopy" - raftselector "github.com/docker/swarmkit/manager/raftselector" _ "github.com/docker/swarmkit/protobuf/plugin" _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" _ "github.com/gogo/protobuf/types" github_com_gogo_protobuf_types "github.com/gogo/protobuf/types" + github_com_moby_swarmkit_v2_api_deepcopy "github.com/moby/swarmkit/v2/api/deepcopy" + raftselector "github.com/moby/swarmkit/v2/manager/raftselector" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" metadata "google.golang.org/grpc/metadata" @@ -1013,7 +1013,7 @@ func (m *SessionRequest) CopyFrom(src interface{}) { *m = *o if o.Description != nil { m.Description = &NodeDescription{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Description, o.Description) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Description, o.Description) } } @@ -1032,13 +1032,13 @@ func (m *SessionMessage) CopyFrom(src interface{}) { *m = *o if o.Node != nil { m.Node = &Node{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Node, o.Node) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Node, o.Node) } if o.Managers != nil { m.Managers = make([]*WeightedPeer, len(o.Managers)) for i := range m.Managers { m.Managers[i] = &WeightedPeer{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Managers[i], o.Managers[i]) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Managers[i], o.Managers[i]) } } @@ -1046,7 +1046,7 @@ func (m *SessionMessage) CopyFrom(src interface{}) { m.NetworkBootstrapKeys = make([]*EncryptionKey, len(o.NetworkBootstrapKeys)) for i := range m.NetworkBootstrapKeys { m.NetworkBootstrapKeys[i] = &EncryptionKey{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.NetworkBootstrapKeys[i], o.NetworkBootstrapKeys[i]) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.NetworkBootstrapKeys[i], o.NetworkBootstrapKeys[i]) } } @@ -1084,7 +1084,7 @@ func (m *HeartbeatResponse) CopyFrom(src interface{}) { o := src.(*HeartbeatResponse) *m = *o - github_com_docker_swarmkit_api_deepcopy.Copy(&m.Period, &o.Period) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(&m.Period, &o.Period) } func (m *UpdateTaskStatusRequest) Copy() *UpdateTaskStatusRequest { @@ -1104,7 +1104,7 @@ func (m *UpdateTaskStatusRequest) CopyFrom(src interface{}) { m.Updates = make([]*UpdateTaskStatusRequest_TaskStatusUpdate, len(o.Updates)) for i := range m.Updates { m.Updates[i] = &UpdateTaskStatusRequest_TaskStatusUpdate{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Updates[i], o.Updates[i]) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Updates[i], o.Updates[i]) } } @@ -1125,7 +1125,7 @@ func (m *UpdateTaskStatusRequest_TaskStatusUpdate) CopyFrom(src interface{}) { *m = *o if o.Status != nil { m.Status = &TaskStatus{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Status, o.Status) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Status, o.Status) } } @@ -1156,7 +1156,7 @@ func (m *UpdateVolumeStatusRequest) CopyFrom(src interface{}) { m.Updates = make([]*UpdateVolumeStatusRequest_VolumeStatusUpdate, len(o.Updates)) for i := range m.Updates { m.Updates[i] = &UpdateVolumeStatusRequest_VolumeStatusUpdate{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Updates[i], o.Updates[i]) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Updates[i], o.Updates[i]) } } @@ -1219,7 +1219,7 @@ func (m *TasksMessage) CopyFrom(src interface{}) { m.Tasks = make([]*Task, len(o.Tasks)) for i := range m.Tasks { m.Tasks[i] = &Task{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Tasks[i], o.Tasks[i]) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Tasks[i], o.Tasks[i]) } } @@ -1259,25 +1259,25 @@ func (m *Assignment) CopyFrom(src interface{}) { v := Assignment_Task{ Task: &Task{}, } - github_com_docker_swarmkit_api_deepcopy.Copy(v.Task, o.GetTask()) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(v.Task, o.GetTask()) m.Item = &v case *Assignment_Secret: v := Assignment_Secret{ Secret: &Secret{}, } - github_com_docker_swarmkit_api_deepcopy.Copy(v.Secret, o.GetSecret()) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(v.Secret, o.GetSecret()) m.Item = &v case *Assignment_Config: v := Assignment_Config{ Config: &Config{}, } - github_com_docker_swarmkit_api_deepcopy.Copy(v.Config, o.GetConfig()) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(v.Config, o.GetConfig()) m.Item = &v case *Assignment_Volume: v := Assignment_Volume{ Volume: &VolumeAssignment{}, } - github_com_docker_swarmkit_api_deepcopy.Copy(v.Volume, o.GetVolume()) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(v.Volume, o.GetVolume()) m.Item = &v } } @@ -1299,7 +1299,7 @@ func (m *AssignmentChange) CopyFrom(src interface{}) { *m = *o if o.Assignment != nil { m.Assignment = &Assignment{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Assignment, o.Assignment) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Assignment, o.Assignment) } } @@ -1320,7 +1320,7 @@ func (m *AssignmentsMessage) CopyFrom(src interface{}) { m.Changes = make([]*AssignmentChange, len(o.Changes)) for i := range m.Changes { m.Changes[i] = &AssignmentChange{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Changes[i], o.Changes[i]) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Changes[i], o.Changes[i]) } } diff --git a/api/equality/equality.go b/api/equality/equality.go index 522c719810..97eea64252 100644 --- a/api/equality/equality.go +++ b/api/equality/equality.go @@ -4,7 +4,7 @@ import ( "crypto/subtle" "reflect" - "github.com/docker/swarmkit/api" + "github.com/moby/swarmkit/v2/api" ) // TasksEqualStable returns true if the tasks are functionally equal, ignoring status, diff --git a/api/equality/equality_test.go b/api/equality/equality_test.go index 417cd33f3a..f3e9ee129f 100644 --- a/api/equality/equality_test.go +++ b/api/equality/equality_test.go @@ -3,7 +3,7 @@ package equality import ( "testing" - "github.com/docker/swarmkit/api" + "github.com/moby/swarmkit/v2/api" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/api/genericresource/helpers.go b/api/genericresource/helpers.go index 350ab730c1..8c29100357 100644 --- a/api/genericresource/helpers.go +++ b/api/genericresource/helpers.go @@ -1,7 +1,7 @@ package genericresource import ( - "github.com/docker/swarmkit/api" + "github.com/moby/swarmkit/v2/api" ) // NewSet creates a set object diff --git a/api/genericresource/helpers_test.go b/api/genericresource/helpers_test.go index 3d00942f1c..65514a3655 100644 --- a/api/genericresource/helpers_test.go +++ b/api/genericresource/helpers_test.go @@ -3,7 +3,7 @@ package genericresource import ( "testing" - "github.com/docker/swarmkit/api" + "github.com/moby/swarmkit/v2/api" "github.com/stretchr/testify/assert" ) diff --git a/api/genericresource/parse.go b/api/genericresource/parse.go index f39a7077a8..7c2a359138 100644 --- a/api/genericresource/parse.go +++ b/api/genericresource/parse.go @@ -6,7 +6,7 @@ import ( "strconv" "strings" - "github.com/docker/swarmkit/api" + "github.com/moby/swarmkit/v2/api" ) func newParseError(format string, args ...interface{}) error { diff --git a/api/genericresource/resource_management.go b/api/genericresource/resource_management.go index 506257ab97..86a358363f 100644 --- a/api/genericresource/resource_management.go +++ b/api/genericresource/resource_management.go @@ -3,7 +3,7 @@ package genericresource import ( "fmt" - "github.com/docker/swarmkit/api" + "github.com/moby/swarmkit/v2/api" ) // Claim assigns GenericResources to a task by taking them from the diff --git a/api/genericresource/resource_management_test.go b/api/genericresource/resource_management_test.go index a857fba48b..d5ea0a32a2 100644 --- a/api/genericresource/resource_management_test.go +++ b/api/genericresource/resource_management_test.go @@ -3,7 +3,7 @@ package genericresource import ( "testing" - "github.com/docker/swarmkit/api" + "github.com/moby/swarmkit/v2/api" "github.com/stretchr/testify/assert" ) diff --git a/api/genericresource/string.go b/api/genericresource/string.go index 5e388bebb0..ded52ffed7 100644 --- a/api/genericresource/string.go +++ b/api/genericresource/string.go @@ -4,7 +4,7 @@ import ( "strconv" "strings" - "github.com/docker/swarmkit/api" + "github.com/moby/swarmkit/v2/api" ) func discreteToString(d *api.GenericResource_DiscreteResourceSpec) string { diff --git a/api/genericresource/validate.go b/api/genericresource/validate.go index 0ad49ff75f..19f2040a70 100644 --- a/api/genericresource/validate.go +++ b/api/genericresource/validate.go @@ -3,7 +3,7 @@ package genericresource import ( "fmt" - "github.com/docker/swarmkit/api" + "github.com/moby/swarmkit/v2/api" ) // ValidateTask validates that the task only uses integers diff --git a/api/health.pb.go b/api/health.pb.go index 3ca506a031..54c9c77a29 100644 --- a/api/health.pb.go +++ b/api/health.pb.go @@ -6,10 +6,10 @@ package api import ( context "context" fmt "fmt" - raftselector "github.com/docker/swarmkit/manager/raftselector" _ "github.com/docker/swarmkit/protobuf/plugin" _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" + raftselector "github.com/moby/swarmkit/v2/manager/raftselector" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" metadata "google.golang.org/grpc/metadata" diff --git a/api/logbroker.pb.go b/api/logbroker.pb.go index 1b95b226c7..f7ce7be902 100644 --- a/api/logbroker.pb.go +++ b/api/logbroker.pb.go @@ -6,12 +6,12 @@ package api import ( context "context" fmt "fmt" - github_com_docker_swarmkit_api_deepcopy "github.com/docker/swarmkit/api/deepcopy" - raftselector "github.com/docker/swarmkit/manager/raftselector" _ "github.com/docker/swarmkit/protobuf/plugin" _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" types "github.com/gogo/protobuf/types" + github_com_moby_swarmkit_v2_api_deepcopy "github.com/moby/swarmkit/v2/api/deepcopy" + raftselector "github.com/moby/swarmkit/v2/manager/raftselector" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" metadata "google.golang.org/grpc/metadata" @@ -686,7 +686,7 @@ func (m *LogSubscriptionOptions) CopyFrom(src interface{}) { if o.Since != nil { m.Since = &types.Timestamp{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Since, o.Since) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Since, o.Since) } } @@ -763,10 +763,10 @@ func (m *LogMessage) CopyFrom(src interface{}) { o := src.(*LogMessage) *m = *o - github_com_docker_swarmkit_api_deepcopy.Copy(&m.Context, &o.Context) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(&m.Context, &o.Context) if o.Timestamp != nil { m.Timestamp = &types.Timestamp{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Timestamp, o.Timestamp) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Timestamp, o.Timestamp) } if o.Data != nil { m.Data = make([]byte, len(o.Data)) @@ -775,7 +775,7 @@ func (m *LogMessage) CopyFrom(src interface{}) { if o.Attrs != nil { m.Attrs = make([]LogAttr, len(o.Attrs)) for i := range m.Attrs { - github_com_docker_swarmkit_api_deepcopy.Copy(&m.Attrs[i], &o.Attrs[i]) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(&m.Attrs[i], &o.Attrs[i]) } } @@ -796,11 +796,11 @@ func (m *SubscribeLogsRequest) CopyFrom(src interface{}) { *m = *o if o.Selector != nil { m.Selector = &LogSelector{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Selector, o.Selector) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Selector, o.Selector) } if o.Options != nil { m.Options = &LogSubscriptionOptions{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Options, o.Options) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Options, o.Options) } } @@ -820,7 +820,7 @@ func (m *SubscribeLogsMessage) CopyFrom(src interface{}) { if o.Messages != nil { m.Messages = make([]LogMessage, len(o.Messages)) for i := range m.Messages { - github_com_docker_swarmkit_api_deepcopy.Copy(&m.Messages[i], &o.Messages[i]) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(&m.Messages[i], &o.Messages[i]) } } @@ -851,11 +851,11 @@ func (m *SubscriptionMessage) CopyFrom(src interface{}) { *m = *o if o.Selector != nil { m.Selector = &LogSelector{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Selector, o.Selector) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Selector, o.Selector) } if o.Options != nil { m.Options = &LogSubscriptionOptions{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Options, o.Options) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Options, o.Options) } } @@ -875,7 +875,7 @@ func (m *PublishLogsMessage) CopyFrom(src interface{}) { if o.Messages != nil { m.Messages = make([]LogMessage, len(o.Messages)) for i := range m.Messages { - github_com_docker_swarmkit_api_deepcopy.Copy(&m.Messages[i], &o.Messages[i]) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(&m.Messages[i], &o.Messages[i]) } } diff --git a/api/naming/naming.go b/api/naming/naming.go index 7e7d4581ea..05edcdadfe 100644 --- a/api/naming/naming.go +++ b/api/naming/naming.go @@ -6,7 +6,7 @@ import ( "fmt" "strings" - "github.com/docker/swarmkit/api" + "github.com/moby/swarmkit/v2/api" ) var ( diff --git a/api/naming/naming_test.go b/api/naming/naming_test.go index d657d0b61b..5549f61f82 100644 --- a/api/naming/naming_test.go +++ b/api/naming/naming_test.go @@ -3,7 +3,7 @@ package naming import ( "testing" - "github.com/docker/swarmkit/api" + "github.com/moby/swarmkit/v2/api" "github.com/stretchr/testify/assert" ) diff --git a/api/objects.pb.go b/api/objects.pb.go index d3cd6c0ce4..8d0115286a 100644 --- a/api/objects.pb.go +++ b/api/objects.pb.go @@ -6,12 +6,12 @@ package api import ( fmt "fmt" github_com_docker_go_events "github.com/docker/go-events" - github_com_docker_swarmkit_api_deepcopy "github.com/docker/swarmkit/api/deepcopy" _ "github.com/docker/swarmkit/protobuf/plugin" _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" github_com_gogo_protobuf_sortkeys "github.com/gogo/protobuf/sortkeys" types "github.com/gogo/protobuf/types" + github_com_moby_swarmkit_v2_api_deepcopy "github.com/moby/swarmkit/v2/api/deepcopy" io "io" math "math" math_bits "math/bits" @@ -963,14 +963,14 @@ func (m *Meta) CopyFrom(src interface{}) { o := src.(*Meta) *m = *o - github_com_docker_swarmkit_api_deepcopy.Copy(&m.Version, &o.Version) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(&m.Version, &o.Version) if o.CreatedAt != nil { m.CreatedAt = &types.Timestamp{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.CreatedAt, o.CreatedAt) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.CreatedAt, o.CreatedAt) } if o.UpdatedAt != nil { m.UpdatedAt = &types.Timestamp{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.UpdatedAt, o.UpdatedAt) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.UpdatedAt, o.UpdatedAt) } } @@ -987,27 +987,27 @@ func (m *Node) CopyFrom(src interface{}) { o := src.(*Node) *m = *o - github_com_docker_swarmkit_api_deepcopy.Copy(&m.Meta, &o.Meta) - github_com_docker_swarmkit_api_deepcopy.Copy(&m.Spec, &o.Spec) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(&m.Meta, &o.Meta) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(&m.Spec, &o.Spec) if o.Description != nil { m.Description = &NodeDescription{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Description, o.Description) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Description, o.Description) } - github_com_docker_swarmkit_api_deepcopy.Copy(&m.Status, &o.Status) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(&m.Status, &o.Status) if o.ManagerStatus != nil { m.ManagerStatus = &ManagerStatus{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.ManagerStatus, o.ManagerStatus) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.ManagerStatus, o.ManagerStatus) } if o.Attachment != nil { m.Attachment = &NetworkAttachment{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Attachment, o.Attachment) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Attachment, o.Attachment) } - github_com_docker_swarmkit_api_deepcopy.Copy(&m.Certificate, &o.Certificate) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(&m.Certificate, &o.Certificate) if o.Attachments != nil { m.Attachments = make([]*NetworkAttachment, len(o.Attachments)) for i := range m.Attachments { m.Attachments[i] = &NetworkAttachment{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Attachments[i], o.Attachments[i]) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Attachments[i], o.Attachments[i]) } } @@ -1026,31 +1026,31 @@ func (m *Service) CopyFrom(src interface{}) { o := src.(*Service) *m = *o - github_com_docker_swarmkit_api_deepcopy.Copy(&m.Meta, &o.Meta) - github_com_docker_swarmkit_api_deepcopy.Copy(&m.Spec, &o.Spec) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(&m.Meta, &o.Meta) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(&m.Spec, &o.Spec) if o.SpecVersion != nil { m.SpecVersion = &Version{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.SpecVersion, o.SpecVersion) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.SpecVersion, o.SpecVersion) } if o.PreviousSpec != nil { m.PreviousSpec = &ServiceSpec{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.PreviousSpec, o.PreviousSpec) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.PreviousSpec, o.PreviousSpec) } if o.PreviousSpecVersion != nil { m.PreviousSpecVersion = &Version{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.PreviousSpecVersion, o.PreviousSpecVersion) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.PreviousSpecVersion, o.PreviousSpecVersion) } if o.Endpoint != nil { m.Endpoint = &Endpoint{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Endpoint, o.Endpoint) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Endpoint, o.Endpoint) } if o.UpdateStatus != nil { m.UpdateStatus = &UpdateStatus{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.UpdateStatus, o.UpdateStatus) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.UpdateStatus, o.UpdateStatus) } if o.JobStatus != nil { m.JobStatus = &JobStatus{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.JobStatus, o.JobStatus) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.JobStatus, o.JobStatus) } } @@ -1069,13 +1069,13 @@ func (m *Endpoint) CopyFrom(src interface{}) { *m = *o if o.Spec != nil { m.Spec = &EndpointSpec{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Spec, o.Spec) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Spec, o.Spec) } if o.Ports != nil { m.Ports = make([]*PortConfig, len(o.Ports)) for i := range m.Ports { m.Ports[i] = &PortConfig{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Ports[i], o.Ports[i]) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Ports[i], o.Ports[i]) } } @@ -1083,7 +1083,7 @@ func (m *Endpoint) CopyFrom(src interface{}) { m.VirtualIPs = make([]*Endpoint_VirtualIP, len(o.VirtualIPs)) for i := range m.VirtualIPs { m.VirtualIPs[i] = &Endpoint_VirtualIP{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.VirtualIPs[i], o.VirtualIPs[i]) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.VirtualIPs[i], o.VirtualIPs[i]) } } @@ -1117,48 +1117,48 @@ func (m *Task) CopyFrom(src interface{}) { o := src.(*Task) *m = *o - github_com_docker_swarmkit_api_deepcopy.Copy(&m.Meta, &o.Meta) - github_com_docker_swarmkit_api_deepcopy.Copy(&m.Spec, &o.Spec) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(&m.Meta, &o.Meta) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(&m.Spec, &o.Spec) if o.SpecVersion != nil { m.SpecVersion = &Version{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.SpecVersion, o.SpecVersion) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.SpecVersion, o.SpecVersion) } - github_com_docker_swarmkit_api_deepcopy.Copy(&m.Annotations, &o.Annotations) - github_com_docker_swarmkit_api_deepcopy.Copy(&m.ServiceAnnotations, &o.ServiceAnnotations) - github_com_docker_swarmkit_api_deepcopy.Copy(&m.Status, &o.Status) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(&m.Annotations, &o.Annotations) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(&m.ServiceAnnotations, &o.ServiceAnnotations) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(&m.Status, &o.Status) if o.Networks != nil { m.Networks = make([]*NetworkAttachment, len(o.Networks)) for i := range m.Networks { m.Networks[i] = &NetworkAttachment{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Networks[i], o.Networks[i]) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Networks[i], o.Networks[i]) } } if o.Endpoint != nil { m.Endpoint = &Endpoint{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Endpoint, o.Endpoint) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Endpoint, o.Endpoint) } if o.LogDriver != nil { m.LogDriver = &Driver{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.LogDriver, o.LogDriver) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.LogDriver, o.LogDriver) } if o.AssignedGenericResources != nil { m.AssignedGenericResources = make([]*GenericResource, len(o.AssignedGenericResources)) for i := range m.AssignedGenericResources { m.AssignedGenericResources[i] = &GenericResource{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.AssignedGenericResources[i], o.AssignedGenericResources[i]) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.AssignedGenericResources[i], o.AssignedGenericResources[i]) } } if o.JobIteration != nil { m.JobIteration = &Version{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.JobIteration, o.JobIteration) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.JobIteration, o.JobIteration) } if o.Volumes != nil { m.Volumes = make([]*VolumeAttachment, len(o.Volumes)) for i := range m.Volumes { m.Volumes[i] = &VolumeAttachment{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Volumes[i], o.Volumes[i]) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Volumes[i], o.Volumes[i]) } } @@ -1179,7 +1179,7 @@ func (m *NetworkAttachment) CopyFrom(src interface{}) { *m = *o if o.Network != nil { m.Network = &Network{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Network, o.Network) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Network, o.Network) } if o.Addresses != nil { m.Addresses = make([]string, len(o.Addresses)) @@ -1213,15 +1213,15 @@ func (m *Network) CopyFrom(src interface{}) { o := src.(*Network) *m = *o - github_com_docker_swarmkit_api_deepcopy.Copy(&m.Meta, &o.Meta) - github_com_docker_swarmkit_api_deepcopy.Copy(&m.Spec, &o.Spec) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(&m.Meta, &o.Meta) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(&m.Spec, &o.Spec) if o.DriverState != nil { m.DriverState = &Driver{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.DriverState, o.DriverState) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.DriverState, o.DriverState) } if o.IPAM != nil { m.IPAM = &IPAMOptions{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.IPAM, o.IPAM) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.IPAM, o.IPAM) } } @@ -1238,14 +1238,14 @@ func (m *Cluster) CopyFrom(src interface{}) { o := src.(*Cluster) *m = *o - github_com_docker_swarmkit_api_deepcopy.Copy(&m.Meta, &o.Meta) - github_com_docker_swarmkit_api_deepcopy.Copy(&m.Spec, &o.Spec) - github_com_docker_swarmkit_api_deepcopy.Copy(&m.RootCA, &o.RootCA) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(&m.Meta, &o.Meta) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(&m.Spec, &o.Spec) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(&m.RootCA, &o.RootCA) if o.NetworkBootstrapKeys != nil { m.NetworkBootstrapKeys = make([]*EncryptionKey, len(o.NetworkBootstrapKeys)) for i := range m.NetworkBootstrapKeys { m.NetworkBootstrapKeys[i] = &EncryptionKey{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.NetworkBootstrapKeys[i], o.NetworkBootstrapKeys[i]) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.NetworkBootstrapKeys[i], o.NetworkBootstrapKeys[i]) } } @@ -1253,7 +1253,7 @@ func (m *Cluster) CopyFrom(src interface{}) { m.BlacklistedCertificates = make(map[string]*BlacklistedCertificate, len(o.BlacklistedCertificates)) for k, v := range o.BlacklistedCertificates { m.BlacklistedCertificates[k] = &BlacklistedCertificate{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.BlacklistedCertificates[k], v) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.BlacklistedCertificates[k], v) } } @@ -1261,7 +1261,7 @@ func (m *Cluster) CopyFrom(src interface{}) { m.UnlockKeys = make([]*EncryptionKey, len(o.UnlockKeys)) for i := range m.UnlockKeys { m.UnlockKeys[i] = &EncryptionKey{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.UnlockKeys[i], o.UnlockKeys[i]) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.UnlockKeys[i], o.UnlockKeys[i]) } } @@ -1285,8 +1285,8 @@ func (m *Secret) CopyFrom(src interface{}) { o := src.(*Secret) *m = *o - github_com_docker_swarmkit_api_deepcopy.Copy(&m.Meta, &o.Meta) - github_com_docker_swarmkit_api_deepcopy.Copy(&m.Spec, &o.Spec) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(&m.Meta, &o.Meta) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(&m.Spec, &o.Spec) } func (m *Config) Copy() *Config { @@ -1302,8 +1302,8 @@ func (m *Config) CopyFrom(src interface{}) { o := src.(*Config) *m = *o - github_com_docker_swarmkit_api_deepcopy.Copy(&m.Meta, &o.Meta) - github_com_docker_swarmkit_api_deepcopy.Copy(&m.Spec, &o.Spec) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(&m.Meta, &o.Meta) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(&m.Spec, &o.Spec) } func (m *Resource) Copy() *Resource { @@ -1319,11 +1319,11 @@ func (m *Resource) CopyFrom(src interface{}) { o := src.(*Resource) *m = *o - github_com_docker_swarmkit_api_deepcopy.Copy(&m.Meta, &o.Meta) - github_com_docker_swarmkit_api_deepcopy.Copy(&m.Annotations, &o.Annotations) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(&m.Meta, &o.Meta) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(&m.Annotations, &o.Annotations) if o.Payload != nil { m.Payload = &types.Any{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Payload, o.Payload) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Payload, o.Payload) } } @@ -1340,8 +1340,8 @@ func (m *Extension) CopyFrom(src interface{}) { o := src.(*Extension) *m = *o - github_com_docker_swarmkit_api_deepcopy.Copy(&m.Meta, &o.Meta) - github_com_docker_swarmkit_api_deepcopy.Copy(&m.Annotations, &o.Annotations) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(&m.Meta, &o.Meta) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(&m.Annotations, &o.Annotations) } func (m *Volume) Copy() *Volume { @@ -1357,19 +1357,19 @@ func (m *Volume) CopyFrom(src interface{}) { o := src.(*Volume) *m = *o - github_com_docker_swarmkit_api_deepcopy.Copy(&m.Meta, &o.Meta) - github_com_docker_swarmkit_api_deepcopy.Copy(&m.Spec, &o.Spec) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(&m.Meta, &o.Meta) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(&m.Spec, &o.Spec) if o.PublishStatus != nil { m.PublishStatus = make([]*VolumePublishStatus, len(o.PublishStatus)) for i := range m.PublishStatus { m.PublishStatus[i] = &VolumePublishStatus{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.PublishStatus[i], o.PublishStatus[i]) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.PublishStatus[i], o.PublishStatus[i]) } } if o.VolumeInfo != nil { m.VolumeInfo = &VolumeInfo{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.VolumeInfo, o.VolumeInfo) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.VolumeInfo, o.VolumeInfo) } } diff --git a/api/raft.pb.go b/api/raft.pb.go index a4619a40e2..96fa855077 100644 --- a/api/raft.pb.go +++ b/api/raft.pb.go @@ -6,9 +6,9 @@ package api import ( context "context" fmt "fmt" - github_com_docker_swarmkit_api_deepcopy "github.com/docker/swarmkit/api/deepcopy" - raftselector "github.com/docker/swarmkit/manager/raftselector" proto "github.com/gogo/protobuf/proto" + github_com_moby_swarmkit_v2_api_deepcopy "github.com/moby/swarmkit/v2/api/deepcopy" + raftselector "github.com/moby/swarmkit/v2/manager/raftselector" raftpb "go.etcd.io/etcd/raft/v3/raftpb" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" @@ -877,7 +877,7 @@ func (m *RaftMember) CopyFrom(src interface{}) { o := src.(*RaftMember) *m = *o - github_com_docker_swarmkit_api_deepcopy.Copy(&m.Status, &o.Status) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(&m.Status, &o.Status) } func (m *JoinRequest) Copy() *JoinRequest { @@ -912,7 +912,7 @@ func (m *JoinResponse) CopyFrom(src interface{}) { m.Members = make([]*RaftMember, len(o.Members)) for i := range m.Members { m.Members[i] = &RaftMember{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Members[i], o.Members[i]) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Members[i], o.Members[i]) } } @@ -938,7 +938,7 @@ func (m *LeaveRequest) CopyFrom(src interface{}) { *m = *o if o.Node != nil { m.Node = &RaftMember{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Node, o.Node) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Node, o.Node) } } @@ -1018,7 +1018,7 @@ func (m *InternalRaftRequest) CopyFrom(src interface{}) { if o.Action != nil { m.Action = make([]StoreAction, len(o.Action)) for i := range m.Action { - github_com_docker_swarmkit_api_deepcopy.Copy(&m.Action[i], &o.Action[i]) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(&m.Action[i], &o.Action[i]) } } @@ -1043,61 +1043,61 @@ func (m *StoreAction) CopyFrom(src interface{}) { v := StoreAction_Node{ Node: &Node{}, } - github_com_docker_swarmkit_api_deepcopy.Copy(v.Node, o.GetNode()) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(v.Node, o.GetNode()) m.Target = &v case *StoreAction_Service: v := StoreAction_Service{ Service: &Service{}, } - github_com_docker_swarmkit_api_deepcopy.Copy(v.Service, o.GetService()) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(v.Service, o.GetService()) m.Target = &v case *StoreAction_Task: v := StoreAction_Task{ Task: &Task{}, } - github_com_docker_swarmkit_api_deepcopy.Copy(v.Task, o.GetTask()) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(v.Task, o.GetTask()) m.Target = &v case *StoreAction_Network: v := StoreAction_Network{ Network: &Network{}, } - github_com_docker_swarmkit_api_deepcopy.Copy(v.Network, o.GetNetwork()) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(v.Network, o.GetNetwork()) m.Target = &v case *StoreAction_Cluster: v := StoreAction_Cluster{ Cluster: &Cluster{}, } - github_com_docker_swarmkit_api_deepcopy.Copy(v.Cluster, o.GetCluster()) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(v.Cluster, o.GetCluster()) m.Target = &v case *StoreAction_Secret: v := StoreAction_Secret{ Secret: &Secret{}, } - github_com_docker_swarmkit_api_deepcopy.Copy(v.Secret, o.GetSecret()) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(v.Secret, o.GetSecret()) m.Target = &v case *StoreAction_Resource: v := StoreAction_Resource{ Resource: &Resource{}, } - github_com_docker_swarmkit_api_deepcopy.Copy(v.Resource, o.GetResource()) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(v.Resource, o.GetResource()) m.Target = &v case *StoreAction_Extension: v := StoreAction_Extension{ Extension: &Extension{}, } - github_com_docker_swarmkit_api_deepcopy.Copy(v.Extension, o.GetExtension()) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(v.Extension, o.GetExtension()) m.Target = &v case *StoreAction_Config: v := StoreAction_Config{ Config: &Config{}, } - github_com_docker_swarmkit_api_deepcopy.Copy(v.Config, o.GetConfig()) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(v.Config, o.GetConfig()) m.Target = &v case *StoreAction_Volume: v := StoreAction_Volume{ Volume: &Volume{}, } - github_com_docker_swarmkit_api_deepcopy.Copy(v.Volume, o.GetVolume()) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(v.Volume, o.GetVolume()) m.Target = &v } } diff --git a/api/resource.pb.go b/api/resource.pb.go index 8c9cf71e26..324104084b 100644 --- a/api/resource.pb.go +++ b/api/resource.pb.go @@ -6,11 +6,11 @@ package api import ( context "context" fmt "fmt" - github_com_docker_swarmkit_api_deepcopy "github.com/docker/swarmkit/api/deepcopy" - raftselector "github.com/docker/swarmkit/manager/raftselector" _ "github.com/docker/swarmkit/protobuf/plugin" _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" + github_com_moby_swarmkit_v2_api_deepcopy "github.com/moby/swarmkit/v2/api/deepcopy" + raftselector "github.com/moby/swarmkit/v2/manager/raftselector" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" metadata "google.golang.org/grpc/metadata" @@ -263,7 +263,7 @@ func (m *AttachNetworkRequest) CopyFrom(src interface{}) { *m = *o if o.Config != nil { m.Config = &NetworkAttachmentConfig{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Config, o.Config) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Config, o.Config) } } diff --git a/api/snapshot.pb.go b/api/snapshot.pb.go index 00233f6d1f..7ab5d978d0 100644 --- a/api/snapshot.pb.go +++ b/api/snapshot.pb.go @@ -5,8 +5,8 @@ package api import ( fmt "fmt" - github_com_docker_swarmkit_api_deepcopy "github.com/docker/swarmkit/api/deepcopy" proto "github.com/gogo/protobuf/proto" + github_com_moby_swarmkit_v2_api_deepcopy "github.com/moby/swarmkit/v2/api/deepcopy" io "io" math "math" math_bits "math/bits" @@ -235,7 +235,7 @@ func (m *StoreSnapshot) CopyFrom(src interface{}) { m.Nodes = make([]*Node, len(o.Nodes)) for i := range m.Nodes { m.Nodes[i] = &Node{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Nodes[i], o.Nodes[i]) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Nodes[i], o.Nodes[i]) } } @@ -243,7 +243,7 @@ func (m *StoreSnapshot) CopyFrom(src interface{}) { m.Services = make([]*Service, len(o.Services)) for i := range m.Services { m.Services[i] = &Service{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Services[i], o.Services[i]) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Services[i], o.Services[i]) } } @@ -251,7 +251,7 @@ func (m *StoreSnapshot) CopyFrom(src interface{}) { m.Networks = make([]*Network, len(o.Networks)) for i := range m.Networks { m.Networks[i] = &Network{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Networks[i], o.Networks[i]) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Networks[i], o.Networks[i]) } } @@ -259,7 +259,7 @@ func (m *StoreSnapshot) CopyFrom(src interface{}) { m.Tasks = make([]*Task, len(o.Tasks)) for i := range m.Tasks { m.Tasks[i] = &Task{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Tasks[i], o.Tasks[i]) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Tasks[i], o.Tasks[i]) } } @@ -267,7 +267,7 @@ func (m *StoreSnapshot) CopyFrom(src interface{}) { m.Clusters = make([]*Cluster, len(o.Clusters)) for i := range m.Clusters { m.Clusters[i] = &Cluster{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Clusters[i], o.Clusters[i]) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Clusters[i], o.Clusters[i]) } } @@ -275,7 +275,7 @@ func (m *StoreSnapshot) CopyFrom(src interface{}) { m.Secrets = make([]*Secret, len(o.Secrets)) for i := range m.Secrets { m.Secrets[i] = &Secret{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Secrets[i], o.Secrets[i]) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Secrets[i], o.Secrets[i]) } } @@ -283,7 +283,7 @@ func (m *StoreSnapshot) CopyFrom(src interface{}) { m.Resources = make([]*Resource, len(o.Resources)) for i := range m.Resources { m.Resources[i] = &Resource{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Resources[i], o.Resources[i]) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Resources[i], o.Resources[i]) } } @@ -291,7 +291,7 @@ func (m *StoreSnapshot) CopyFrom(src interface{}) { m.Extensions = make([]*Extension, len(o.Extensions)) for i := range m.Extensions { m.Extensions[i] = &Extension{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Extensions[i], o.Extensions[i]) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Extensions[i], o.Extensions[i]) } } @@ -299,7 +299,7 @@ func (m *StoreSnapshot) CopyFrom(src interface{}) { m.Configs = make([]*Config, len(o.Configs)) for i := range m.Configs { m.Configs[i] = &Config{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Configs[i], o.Configs[i]) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Configs[i], o.Configs[i]) } } @@ -307,7 +307,7 @@ func (m *StoreSnapshot) CopyFrom(src interface{}) { m.Volumes = make([]*Volume, len(o.Volumes)) for i := range m.Volumes { m.Volumes[i] = &Volume{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Volumes[i], o.Volumes[i]) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Volumes[i], o.Volumes[i]) } } @@ -330,7 +330,7 @@ func (m *ClusterSnapshot) CopyFrom(src interface{}) { m.Members = make([]*RaftMember, len(o.Members)) for i := range m.Members { m.Members[i] = &RaftMember{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Members[i], o.Members[i]) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Members[i], o.Members[i]) } } @@ -354,8 +354,8 @@ func (m *Snapshot) CopyFrom(src interface{}) { o := src.(*Snapshot) *m = *o - github_com_docker_swarmkit_api_deepcopy.Copy(&m.Membership, &o.Membership) - github_com_docker_swarmkit_api_deepcopy.Copy(&m.Store, &o.Store) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(&m.Membership, &o.Membership) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(&m.Store, &o.Store) } func (m *StoreSnapshot) Marshal() (dAtA []byte, err error) { diff --git a/api/specs.pb.go b/api/specs.pb.go index 216be651f9..a789d5a95e 100644 --- a/api/specs.pb.go +++ b/api/specs.pb.go @@ -5,11 +5,11 @@ package api import ( fmt "fmt" - github_com_docker_swarmkit_api_deepcopy "github.com/docker/swarmkit/api/deepcopy" _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" github_com_gogo_protobuf_sortkeys "github.com/gogo/protobuf/sortkeys" types "github.com/gogo/protobuf/types" + github_com_moby_swarmkit_v2_api_deepcopy "github.com/moby/swarmkit/v2/api/deepcopy" io "io" math "math" math_bits "math/bits" @@ -1604,7 +1604,7 @@ func (m *NodeSpec) CopyFrom(src interface{}) { o := src.(*NodeSpec) *m = *o - github_com_docker_swarmkit_api_deepcopy.Copy(&m.Annotations, &o.Annotations) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(&m.Annotations, &o.Annotations) } func (m *ServiceSpec) Copy() *ServiceSpec { @@ -1620,27 +1620,27 @@ func (m *ServiceSpec) CopyFrom(src interface{}) { o := src.(*ServiceSpec) *m = *o - github_com_docker_swarmkit_api_deepcopy.Copy(&m.Annotations, &o.Annotations) - github_com_docker_swarmkit_api_deepcopy.Copy(&m.Task, &o.Task) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(&m.Annotations, &o.Annotations) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(&m.Task, &o.Task) if o.Update != nil { m.Update = &UpdateConfig{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Update, o.Update) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Update, o.Update) } if o.Rollback != nil { m.Rollback = &UpdateConfig{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Rollback, o.Rollback) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Rollback, o.Rollback) } if o.Networks != nil { m.Networks = make([]*NetworkAttachmentConfig, len(o.Networks)) for i := range m.Networks { m.Networks[i] = &NetworkAttachmentConfig{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Networks[i], o.Networks[i]) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Networks[i], o.Networks[i]) } } if o.Endpoint != nil { m.Endpoint = &EndpointSpec{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Endpoint, o.Endpoint) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Endpoint, o.Endpoint) } if o.Mode != nil { switch o.Mode.(type) { @@ -1648,25 +1648,25 @@ func (m *ServiceSpec) CopyFrom(src interface{}) { v := ServiceSpec_Replicated{ Replicated: &ReplicatedService{}, } - github_com_docker_swarmkit_api_deepcopy.Copy(v.Replicated, o.GetReplicated()) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(v.Replicated, o.GetReplicated()) m.Mode = &v case *ServiceSpec_Global: v := ServiceSpec_Global{ Global: &GlobalService{}, } - github_com_docker_swarmkit_api_deepcopy.Copy(v.Global, o.GetGlobal()) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(v.Global, o.GetGlobal()) m.Mode = &v case *ServiceSpec_ReplicatedJob: v := ServiceSpec_ReplicatedJob{ ReplicatedJob: &ReplicatedJob{}, } - github_com_docker_swarmkit_api_deepcopy.Copy(v.ReplicatedJob, o.GetReplicatedJob()) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(v.ReplicatedJob, o.GetReplicatedJob()) m.Mode = &v case *ServiceSpec_GlobalJob: v := ServiceSpec_GlobalJob{ GlobalJob: &GlobalJob{}, } - github_com_docker_swarmkit_api_deepcopy.Copy(v.GlobalJob, o.GetGlobalJob()) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(v.GlobalJob, o.GetGlobalJob()) m.Mode = &v } } @@ -1738,32 +1738,32 @@ func (m *TaskSpec) CopyFrom(src interface{}) { *m = *o if o.Resources != nil { m.Resources = &ResourceRequirements{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Resources, o.Resources) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Resources, o.Resources) } if o.Restart != nil { m.Restart = &RestartPolicy{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Restart, o.Restart) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Restart, o.Restart) } if o.Placement != nil { m.Placement = &Placement{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Placement, o.Placement) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Placement, o.Placement) } if o.LogDriver != nil { m.LogDriver = &Driver{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.LogDriver, o.LogDriver) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.LogDriver, o.LogDriver) } if o.Networks != nil { m.Networks = make([]*NetworkAttachmentConfig, len(o.Networks)) for i := range m.Networks { m.Networks[i] = &NetworkAttachmentConfig{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Networks[i], o.Networks[i]) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Networks[i], o.Networks[i]) } } if o.ResourceReferences != nil { m.ResourceReferences = make([]ResourceReference, len(o.ResourceReferences)) for i := range m.ResourceReferences { - github_com_docker_swarmkit_api_deepcopy.Copy(&m.ResourceReferences[i], &o.ResourceReferences[i]) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(&m.ResourceReferences[i], &o.ResourceReferences[i]) } } @@ -1773,19 +1773,19 @@ func (m *TaskSpec) CopyFrom(src interface{}) { v := TaskSpec_Attachment{ Attachment: &NetworkAttachmentSpec{}, } - github_com_docker_swarmkit_api_deepcopy.Copy(v.Attachment, o.GetAttachment()) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(v.Attachment, o.GetAttachment()) m.Runtime = &v case *TaskSpec_Container: v := TaskSpec_Container{ Container: &ContainerSpec{}, } - github_com_docker_swarmkit_api_deepcopy.Copy(v.Container, o.GetContainer()) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(v.Container, o.GetContainer()) m.Runtime = &v case *TaskSpec_Generic: v := TaskSpec_Generic{ Generic: &GenericRuntimeSpec{}, } - github_com_docker_swarmkit_api_deepcopy.Copy(v.Generic, o.GetGeneric()) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(v.Generic, o.GetGeneric()) m.Runtime = &v } } @@ -1822,7 +1822,7 @@ func (m *GenericRuntimeSpec) CopyFrom(src interface{}) { *m = *o if o.Payload != nil { m.Payload = &types.Any{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Payload, o.Payload) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Payload, o.Payload) } } @@ -1883,32 +1883,32 @@ func (m *ContainerSpec) CopyFrom(src interface{}) { if o.Privileges != nil { m.Privileges = &Privileges{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Privileges, o.Privileges) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Privileges, o.Privileges) } if o.Init != nil { m.Init = &types.BoolValue{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Init, o.Init) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Init, o.Init) } if o.Mounts != nil { m.Mounts = make([]Mount, len(o.Mounts)) for i := range m.Mounts { - github_com_docker_swarmkit_api_deepcopy.Copy(&m.Mounts[i], &o.Mounts[i]) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(&m.Mounts[i], &o.Mounts[i]) } } if o.StopGracePeriod != nil { m.StopGracePeriod = &types.Duration{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.StopGracePeriod, o.StopGracePeriod) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.StopGracePeriod, o.StopGracePeriod) } if o.PullOptions != nil { m.PullOptions = &ContainerSpec_PullOptions{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.PullOptions, o.PullOptions) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.PullOptions, o.PullOptions) } if o.Secrets != nil { m.Secrets = make([]*SecretReference, len(o.Secrets)) for i := range m.Secrets { m.Secrets[i] = &SecretReference{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Secrets[i], o.Secrets[i]) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Secrets[i], o.Secrets[i]) } } @@ -1916,7 +1916,7 @@ func (m *ContainerSpec) CopyFrom(src interface{}) { m.Configs = make([]*ConfigReference, len(o.Configs)) for i := range m.Configs { m.Configs[i] = &ConfigReference{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Configs[i], o.Configs[i]) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Configs[i], o.Configs[i]) } } @@ -1927,11 +1927,11 @@ func (m *ContainerSpec) CopyFrom(src interface{}) { if o.DNSConfig != nil { m.DNSConfig = &ContainerSpec_DNSConfig{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.DNSConfig, o.DNSConfig) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.DNSConfig, o.DNSConfig) } if o.Healthcheck != nil { m.Healthcheck = &HealthConfig{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Healthcheck, o.Healthcheck) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Healthcheck, o.Healthcheck) } if o.Sysctls != nil { m.Sysctls = make(map[string]string, len(o.Sysctls)) @@ -1954,7 +1954,7 @@ func (m *ContainerSpec) CopyFrom(src interface{}) { m.Ulimits = make([]*ContainerSpec_Ulimit, len(o.Ulimits)) for i := range m.Ulimits { m.Ulimits[i] = &ContainerSpec_Ulimit{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Ulimits[i], o.Ulimits[i]) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Ulimits[i], o.Ulimits[i]) } } @@ -2037,7 +2037,7 @@ func (m *EndpointSpec) CopyFrom(src interface{}) { m.Ports = make([]*PortConfig, len(o.Ports)) for i := range m.Ports { m.Ports[i] = &PortConfig{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Ports[i], o.Ports[i]) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Ports[i], o.Ports[i]) } } @@ -2056,14 +2056,14 @@ func (m *NetworkSpec) CopyFrom(src interface{}) { o := src.(*NetworkSpec) *m = *o - github_com_docker_swarmkit_api_deepcopy.Copy(&m.Annotations, &o.Annotations) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(&m.Annotations, &o.Annotations) if o.DriverConfig != nil { m.DriverConfig = &Driver{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.DriverConfig, o.DriverConfig) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.DriverConfig, o.DriverConfig) } if o.IPAM != nil { m.IPAM = &IPAMOptions{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.IPAM, o.IPAM) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.IPAM, o.IPAM) } if o.ConfigFrom != nil { switch o.ConfigFrom.(type) { @@ -2090,14 +2090,14 @@ func (m *ClusterSpec) CopyFrom(src interface{}) { o := src.(*ClusterSpec) *m = *o - github_com_docker_swarmkit_api_deepcopy.Copy(&m.Annotations, &o.Annotations) - github_com_docker_swarmkit_api_deepcopy.Copy(&m.AcceptancePolicy, &o.AcceptancePolicy) - github_com_docker_swarmkit_api_deepcopy.Copy(&m.Orchestration, &o.Orchestration) - github_com_docker_swarmkit_api_deepcopy.Copy(&m.Raft, &o.Raft) - github_com_docker_swarmkit_api_deepcopy.Copy(&m.Dispatcher, &o.Dispatcher) - github_com_docker_swarmkit_api_deepcopy.Copy(&m.CAConfig, &o.CAConfig) - github_com_docker_swarmkit_api_deepcopy.Copy(&m.TaskDefaults, &o.TaskDefaults) - github_com_docker_swarmkit_api_deepcopy.Copy(&m.EncryptionConfig, &o.EncryptionConfig) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(&m.Annotations, &o.Annotations) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(&m.AcceptancePolicy, &o.AcceptancePolicy) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(&m.Orchestration, &o.Orchestration) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(&m.Raft, &o.Raft) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(&m.Dispatcher, &o.Dispatcher) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(&m.CAConfig, &o.CAConfig) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(&m.TaskDefaults, &o.TaskDefaults) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(&m.EncryptionConfig, &o.EncryptionConfig) } func (m *SecretSpec) Copy() *SecretSpec { @@ -2113,18 +2113,18 @@ func (m *SecretSpec) CopyFrom(src interface{}) { o := src.(*SecretSpec) *m = *o - github_com_docker_swarmkit_api_deepcopy.Copy(&m.Annotations, &o.Annotations) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(&m.Annotations, &o.Annotations) if o.Data != nil { m.Data = make([]byte, len(o.Data)) copy(m.Data, o.Data) } if o.Templating != nil { m.Templating = &Driver{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Templating, o.Templating) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Templating, o.Templating) } if o.Driver != nil { m.Driver = &Driver{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Driver, o.Driver) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Driver, o.Driver) } } @@ -2141,14 +2141,14 @@ func (m *ConfigSpec) CopyFrom(src interface{}) { o := src.(*ConfigSpec) *m = *o - github_com_docker_swarmkit_api_deepcopy.Copy(&m.Annotations, &o.Annotations) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(&m.Annotations, &o.Annotations) if o.Data != nil { m.Data = make([]byte, len(o.Data)) copy(m.Data, o.Data) } if o.Templating != nil { m.Templating = &Driver{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Templating, o.Templating) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Templating, o.Templating) } } @@ -2165,30 +2165,30 @@ func (m *VolumeSpec) CopyFrom(src interface{}) { o := src.(*VolumeSpec) *m = *o - github_com_docker_swarmkit_api_deepcopy.Copy(&m.Annotations, &o.Annotations) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(&m.Annotations, &o.Annotations) if o.Driver != nil { m.Driver = &Driver{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Driver, o.Driver) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Driver, o.Driver) } if o.AccessMode != nil { m.AccessMode = &VolumeAccessMode{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.AccessMode, o.AccessMode) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.AccessMode, o.AccessMode) } if o.Secrets != nil { m.Secrets = make([]*VolumeSecret, len(o.Secrets)) for i := range m.Secrets { m.Secrets[i] = &VolumeSecret{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Secrets[i], o.Secrets[i]) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Secrets[i], o.Secrets[i]) } } if o.AccessibilityRequirements != nil { m.AccessibilityRequirements = &TopologyRequirement{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.AccessibilityRequirements, o.AccessibilityRequirements) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.AccessibilityRequirements, o.AccessibilityRequirements) } if o.CapacityRange != nil { m.CapacityRange = &CapacityRange{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.CapacityRange, o.CapacityRange) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.CapacityRange, o.CapacityRange) } } diff --git a/api/types.pb.go b/api/types.pb.go index f916111cd5..779e3e10c7 100644 --- a/api/types.pb.go +++ b/api/types.pb.go @@ -6,12 +6,12 @@ package api import ( encoding_binary "encoding/binary" fmt "fmt" - github_com_docker_swarmkit_api_deepcopy "github.com/docker/swarmkit/api/deepcopy" _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" github_com_gogo_protobuf_sortkeys "github.com/gogo/protobuf/sortkeys" github_com_gogo_protobuf_types "github.com/gogo/protobuf/types" types "github.com/gogo/protobuf/types" + github_com_moby_swarmkit_v2_api_deepcopy "github.com/moby/swarmkit/v2/api/deepcopy" io "io" math "math" math_bits "math/bits" @@ -5455,7 +5455,7 @@ func (m *Annotations) CopyFrom(src interface{}) { if o.Indices != nil { m.Indices = make([]IndexEntry, len(o.Indices)) for i := range m.Indices { - github_com_docker_swarmkit_api_deepcopy.Copy(&m.Indices[i], &o.Indices[i]) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(&m.Indices[i], &o.Indices[i]) } } @@ -5510,13 +5510,13 @@ func (m *GenericResource) CopyFrom(src interface{}) { v := GenericResource_NamedResourceSpec{ NamedResourceSpec: &NamedGenericResource{}, } - github_com_docker_swarmkit_api_deepcopy.Copy(v.NamedResourceSpec, o.GetNamedResourceSpec()) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(v.NamedResourceSpec, o.GetNamedResourceSpec()) m.Resource = &v case *GenericResource_DiscreteResourceSpec: v := GenericResource_DiscreteResourceSpec{ DiscreteResourceSpec: &DiscreteGenericResource{}, } - github_com_docker_swarmkit_api_deepcopy.Copy(v.DiscreteResourceSpec, o.GetDiscreteResourceSpec()) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(v.DiscreteResourceSpec, o.GetDiscreteResourceSpec()) m.Resource = &v } } @@ -5540,7 +5540,7 @@ func (m *Resources) CopyFrom(src interface{}) { m.Generic = make([]*GenericResource, len(o.Generic)) for i := range m.Generic { m.Generic[i] = &GenericResource{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Generic[i], o.Generic[i]) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Generic[i], o.Generic[i]) } } @@ -5561,19 +5561,19 @@ func (m *ResourceRequirements) CopyFrom(src interface{}) { *m = *o if o.Limits != nil { m.Limits = &Resources{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Limits, o.Limits) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Limits, o.Limits) } if o.Reservations != nil { m.Reservations = &Resources{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Reservations, o.Reservations) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Reservations, o.Reservations) } if o.SwapBytes != nil { m.SwapBytes = &types.Int64Value{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.SwapBytes, o.SwapBytes) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.SwapBytes, o.SwapBytes) } if o.MemorySwappiness != nil { m.MemorySwappiness = &types.Int64Value{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.MemorySwappiness, o.MemorySwappiness) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.MemorySwappiness, o.MemorySwappiness) } } @@ -5630,7 +5630,7 @@ func (m *EngineDescription) CopyFrom(src interface{}) { if o.Plugins != nil { m.Plugins = make([]PluginDescription, len(o.Plugins)) for i := range m.Plugins { - github_com_docker_swarmkit_api_deepcopy.Copy(&m.Plugins[i], &o.Plugins[i]) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(&m.Plugins[i], &o.Plugins[i]) } } @@ -5651,25 +5651,25 @@ func (m *NodeDescription) CopyFrom(src interface{}) { *m = *o if o.Platform != nil { m.Platform = &Platform{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Platform, o.Platform) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Platform, o.Platform) } if o.Resources != nil { m.Resources = &Resources{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Resources, o.Resources) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Resources, o.Resources) } if o.Engine != nil { m.Engine = &EngineDescription{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Engine, o.Engine) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Engine, o.Engine) } if o.TLSInfo != nil { m.TLSInfo = &NodeTLSInfo{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.TLSInfo, o.TLSInfo) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.TLSInfo, o.TLSInfo) } if o.CSIInfo != nil { m.CSIInfo = make([]*NodeCSIInfo, len(o.CSIInfo)) for i := range m.CSIInfo { m.CSIInfo[i] = &NodeCSIInfo{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.CSIInfo[i], o.CSIInfo[i]) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.CSIInfo[i], o.CSIInfo[i]) } } @@ -5717,7 +5717,7 @@ func (m *NodeCSIInfo) CopyFrom(src interface{}) { *m = *o if o.AccessibleTopology != nil { m.AccessibleTopology = &Topology{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.AccessibleTopology, o.AccessibleTopology) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.AccessibleTopology, o.AccessibleTopology) } } @@ -5781,15 +5781,15 @@ func (m *Mount) CopyFrom(src interface{}) { *m = *o if o.BindOptions != nil { m.BindOptions = &Mount_BindOptions{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.BindOptions, o.BindOptions) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.BindOptions, o.BindOptions) } if o.VolumeOptions != nil { m.VolumeOptions = &Mount_VolumeOptions{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.VolumeOptions, o.VolumeOptions) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.VolumeOptions, o.VolumeOptions) } if o.TmpfsOptions != nil { m.TmpfsOptions = &Mount_TmpfsOptions{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.TmpfsOptions, o.TmpfsOptions) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.TmpfsOptions, o.TmpfsOptions) } } @@ -5830,7 +5830,7 @@ func (m *Mount_VolumeOptions) CopyFrom(src interface{}) { if o.DriverConfig != nil { m.DriverConfig = &Driver{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.DriverConfig, o.DriverConfig) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.DriverConfig, o.DriverConfig) } } @@ -5864,11 +5864,11 @@ func (m *RestartPolicy) CopyFrom(src interface{}) { *m = *o if o.Delay != nil { m.Delay = &types.Duration{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Delay, o.Delay) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Delay, o.Delay) } if o.Window != nil { m.Window = &types.Duration{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Window, o.Window) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Window, o.Window) } } @@ -5885,10 +5885,10 @@ func (m *UpdateConfig) CopyFrom(src interface{}) { o := src.(*UpdateConfig) *m = *o - github_com_docker_swarmkit_api_deepcopy.Copy(&m.Delay, &o.Delay) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(&m.Delay, &o.Delay) if o.Monitor != nil { m.Monitor = &types.Duration{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Monitor, o.Monitor) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Monitor, o.Monitor) } } @@ -5907,11 +5907,11 @@ func (m *UpdateStatus) CopyFrom(src interface{}) { *m = *o if o.StartedAt != nil { m.StartedAt = &types.Timestamp{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.StartedAt, o.StartedAt) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.StartedAt, o.StartedAt) } if o.CompletedAt != nil { m.CompletedAt = &types.Timestamp{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.CompletedAt, o.CompletedAt) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.CompletedAt, o.CompletedAt) } } @@ -5947,7 +5947,7 @@ func (m *PortStatus) CopyFrom(src interface{}) { m.Ports = make([]*PortConfig, len(o.Ports)) for i := range m.Ports { m.Ports[i] = &PortConfig{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Ports[i], o.Ports[i]) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Ports[i], o.Ports[i]) } } @@ -5968,15 +5968,15 @@ func (m *TaskStatus) CopyFrom(src interface{}) { *m = *o if o.Timestamp != nil { m.Timestamp = &types.Timestamp{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Timestamp, o.Timestamp) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Timestamp, o.Timestamp) } if o.PortStatus != nil { m.PortStatus = &PortStatus{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.PortStatus, o.PortStatus) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.PortStatus, o.PortStatus) } if o.AppliedAt != nil { m.AppliedAt = &types.Timestamp{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.AppliedAt, o.AppliedAt) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.AppliedAt, o.AppliedAt) } if o.RuntimeStatus != nil { switch o.RuntimeStatus.(type) { @@ -5984,7 +5984,7 @@ func (m *TaskStatus) CopyFrom(src interface{}) { v := TaskStatus_Container{ Container: &ContainerStatus{}, } - github_com_docker_swarmkit_api_deepcopy.Copy(v.Container, o.GetContainer()) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(v.Container, o.GetContainer()) m.RuntimeStatus = &v } } @@ -6097,13 +6097,13 @@ func (m *IPAMOptions) CopyFrom(src interface{}) { *m = *o if o.Driver != nil { m.Driver = &Driver{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Driver, o.Driver) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Driver, o.Driver) } if o.Configs != nil { m.Configs = make([]*IPAMConfig, len(o.Configs)) for i := range m.Configs { m.Configs[i] = &IPAMConfig{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Configs[i], o.Configs[i]) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Configs[i], o.Configs[i]) } } @@ -6139,7 +6139,7 @@ func (m *WeightedPeer) CopyFrom(src interface{}) { *m = *o if o.Peer != nil { m.Peer = &Peer{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Peer, o.Peer) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Peer, o.Peer) } } @@ -6175,7 +6175,7 @@ func (m *AcceptancePolicy) CopyFrom(src interface{}) { m.Policies = make([]*AcceptancePolicy_RoleAdmissionPolicy, len(o.Policies)) for i := range m.Policies { m.Policies[i] = &AcceptancePolicy_RoleAdmissionPolicy{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Policies[i], o.Policies[i]) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Policies[i], o.Policies[i]) } } @@ -6196,7 +6196,7 @@ func (m *AcceptancePolicy_RoleAdmissionPolicy) CopyFrom(src interface{}) { *m = *o if o.Secret != nil { m.Secret = &AcceptancePolicy_RoleAdmissionPolicy_Secret{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Secret, o.Secret) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Secret, o.Secret) } } @@ -6260,13 +6260,13 @@ func (m *CAConfig) CopyFrom(src interface{}) { *m = *o if o.NodeCertExpiry != nil { m.NodeCertExpiry = &types.Duration{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.NodeCertExpiry, o.NodeCertExpiry) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.NodeCertExpiry, o.NodeCertExpiry) } if o.ExternalCAs != nil { m.ExternalCAs = make([]*ExternalCA, len(o.ExternalCAs)) for i := range m.ExternalCAs { m.ExternalCAs[i] = &ExternalCA{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.ExternalCAs[i], o.ExternalCAs[i]) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.ExternalCAs[i], o.ExternalCAs[i]) } } @@ -6310,7 +6310,7 @@ func (m *TaskDefaults) CopyFrom(src interface{}) { *m = *o if o.LogDriver != nil { m.LogDriver = &Driver{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.LogDriver, o.LogDriver) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.LogDriver, o.LogDriver) } } @@ -6329,7 +6329,7 @@ func (m *DispatcherConfig) CopyFrom(src interface{}) { *m = *o if o.HeartbeatPeriod != nil { m.HeartbeatPeriod = &types.Duration{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.HeartbeatPeriod, o.HeartbeatPeriod) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.HeartbeatPeriod, o.HeartbeatPeriod) } } @@ -6397,7 +6397,7 @@ func (m *PlacementPreference) CopyFrom(src interface{}) { v := PlacementPreference_Spread{ Spread: &SpreadOver{}, } - github_com_docker_swarmkit_api_deepcopy.Copy(v.Spread, o.GetSpread()) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(v.Spread, o.GetSpread()) m.Preference = &v } } @@ -6426,7 +6426,7 @@ func (m *Placement) CopyFrom(src interface{}) { m.Preferences = make([]*PlacementPreference, len(o.Preferences)) for i := range m.Preferences { m.Preferences[i] = &PlacementPreference{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Preferences[i], o.Preferences[i]) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Preferences[i], o.Preferences[i]) } } @@ -6434,7 +6434,7 @@ func (m *Placement) CopyFrom(src interface{}) { m.Platforms = make([]*Platform, len(o.Platforms)) for i := range m.Platforms { m.Platforms[i] = &Platform{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Platforms[i], o.Platforms[i]) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Platforms[i], o.Platforms[i]) } } @@ -6476,10 +6476,10 @@ func (m *RootCA) CopyFrom(src interface{}) { m.CACert = make([]byte, len(o.CACert)) copy(m.CACert, o.CACert) } - github_com_docker_swarmkit_api_deepcopy.Copy(&m.JoinTokens, &o.JoinTokens) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(&m.JoinTokens, &o.JoinTokens) if o.RootRotation != nil { m.RootRotation = &RootRotation{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.RootRotation, o.RootRotation) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.RootRotation, o.RootRotation) } } @@ -6500,7 +6500,7 @@ func (m *Certificate) CopyFrom(src interface{}) { m.CSR = make([]byte, len(o.CSR)) copy(m.CSR, o.CSR) } - github_com_docker_swarmkit_api_deepcopy.Copy(&m.Status, &o.Status) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(&m.Status, &o.Status) if o.Certificate != nil { m.Certificate = make([]byte, len(o.Certificate)) copy(m.Certificate, o.Certificate) @@ -6585,7 +6585,7 @@ func (m *SecretReference) CopyFrom(src interface{}) { v := SecretReference_File{ File: &FileTarget{}, } - github_com_docker_swarmkit_api_deepcopy.Copy(v.File, o.GetFile()) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(v.File, o.GetFile()) m.Target = &v } } @@ -6611,13 +6611,13 @@ func (m *ConfigReference) CopyFrom(src interface{}) { v := ConfigReference_File{ File: &FileTarget{}, } - github_com_docker_swarmkit_api_deepcopy.Copy(v.File, o.GetFile()) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(v.File, o.GetFile()) m.Target = &v case *ConfigReference_Runtime: v := ConfigReference_Runtime{ Runtime: &RuntimeTarget{}, } - github_com_docker_swarmkit_api_deepcopy.Copy(v.Runtime, o.GetRuntime()) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(v.Runtime, o.GetRuntime()) m.Target = &v } } @@ -6639,7 +6639,7 @@ func (m *BlacklistedCertificate) CopyFrom(src interface{}) { *m = *o if o.Expiry != nil { m.Expiry = &types.Timestamp{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Expiry, o.Expiry) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Expiry, o.Expiry) } } @@ -6663,15 +6663,15 @@ func (m *HealthConfig) CopyFrom(src interface{}) { if o.Interval != nil { m.Interval = &types.Duration{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Interval, o.Interval) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Interval, o.Interval) } if o.Timeout != nil { m.Timeout = &types.Duration{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Timeout, o.Timeout) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Timeout, o.Timeout) } if o.StartPeriod != nil { m.StartPeriod = &types.Duration{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.StartPeriod, o.StartPeriod) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.StartPeriod, o.StartPeriod) } } @@ -6740,11 +6740,11 @@ func (m *Privileges) CopyFrom(src interface{}) { *m = *o if o.CredentialSpec != nil { m.CredentialSpec = &Privileges_CredentialSpec{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.CredentialSpec, o.CredentialSpec) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.CredentialSpec, o.CredentialSpec) } if o.SELinuxContext != nil { m.SELinuxContext = &Privileges_SELinuxContext{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.SELinuxContext, o.SELinuxContext) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.SELinuxContext, o.SELinuxContext) } } @@ -6811,10 +6811,10 @@ func (m *JobStatus) CopyFrom(src interface{}) { o := src.(*JobStatus) *m = *o - github_com_docker_swarmkit_api_deepcopy.Copy(&m.JobIteration, &o.JobIteration) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(&m.JobIteration, &o.JobIteration) if o.LastExecution != nil { m.LastExecution = &types.Timestamp{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.LastExecution, o.LastExecution) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.LastExecution, o.LastExecution) } } @@ -6837,13 +6837,13 @@ func (m *VolumeAccessMode) CopyFrom(src interface{}) { v := VolumeAccessMode_Block{ Block: &VolumeAccessMode_BlockVolume{}, } - github_com_docker_swarmkit_api_deepcopy.Copy(v.Block, o.GetBlock()) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(v.Block, o.GetBlock()) m.AccessType = &v case *VolumeAccessMode_Mount: v := VolumeAccessMode_Mount{ Mount: &VolumeAccessMode_MountVolume{}, } - github_com_docker_swarmkit_api_deepcopy.Copy(v.Mount, o.GetMount()) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(v.Mount, o.GetMount()) m.AccessType = &v } } @@ -6941,7 +6941,7 @@ func (m *VolumeInfo) CopyFrom(src interface{}) { m.AccessibleTopology = make([]*Topology, len(o.AccessibleTopology)) for i := range m.AccessibleTopology { m.AccessibleTopology[i] = &Topology{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.AccessibleTopology[i], o.AccessibleTopology[i]) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.AccessibleTopology[i], o.AccessibleTopology[i]) } } @@ -6977,7 +6977,7 @@ func (m *VolumeAssignment) CopyFrom(src interface{}) { *m = *o if o.Driver != nil { m.Driver = &Driver{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Driver, o.Driver) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Driver, o.Driver) } if o.VolumeContext != nil { m.VolumeContext = make(map[string]string, len(o.VolumeContext)) @@ -6995,13 +6995,13 @@ func (m *VolumeAssignment) CopyFrom(src interface{}) { if o.AccessMode != nil { m.AccessMode = &VolumeAccessMode{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.AccessMode, o.AccessMode) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.AccessMode, o.AccessMode) } if o.Secrets != nil { m.Secrets = make([]*VolumeSecret, len(o.Secrets)) for i := range m.Secrets { m.Secrets[i] = &VolumeSecret{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Secrets[i], o.Secrets[i]) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Secrets[i], o.Secrets[i]) } } @@ -7039,7 +7039,7 @@ func (m *TopologyRequirement) CopyFrom(src interface{}) { m.Requisite = make([]*Topology, len(o.Requisite)) for i := range m.Requisite { m.Requisite[i] = &Topology{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Requisite[i], o.Requisite[i]) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Requisite[i], o.Requisite[i]) } } @@ -7047,7 +7047,7 @@ func (m *TopologyRequirement) CopyFrom(src interface{}) { m.Preferred = make([]*Topology, len(o.Preferred)) for i := range m.Preferred { m.Preferred[i] = &Topology{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Preferred[i], o.Preferred[i]) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Preferred[i], o.Preferred[i]) } } @@ -7090,7 +7090,7 @@ func (m *VolumeCapability) CopyFrom(src interface{}) { *m = *o if o.AccessMode != nil { m.AccessMode = &VolumeCapability_AccessMode{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.AccessMode, o.AccessMode) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.AccessMode, o.AccessMode) } if o.AccessType != nil { switch o.AccessType.(type) { @@ -7098,13 +7098,13 @@ func (m *VolumeCapability) CopyFrom(src interface{}) { v := VolumeCapability_Block{ Block: &VolumeCapability_BlockVolume{}, } - github_com_docker_swarmkit_api_deepcopy.Copy(v.Block, o.GetBlock()) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(v.Block, o.GetBlock()) m.AccessType = &v case *VolumeCapability_Mount: v := VolumeCapability_Mount{ Mount: &VolumeCapability_MountVolume{}, } - github_com_docker_swarmkit_api_deepcopy.Copy(v.Mount, o.GetMount()) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(v.Mount, o.GetMount()) m.AccessType = &v } } diff --git a/api/watch.pb.go b/api/watch.pb.go index 2ff66cb5aa..c54e27d680 100644 --- a/api/watch.pb.go +++ b/api/watch.pb.go @@ -6,11 +6,11 @@ package api import ( context "context" fmt "fmt" - github_com_docker_swarmkit_api_deepcopy "github.com/docker/swarmkit/api/deepcopy" - raftselector "github.com/docker/swarmkit/manager/raftselector" _ "github.com/docker/swarmkit/protobuf/plugin" _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" + github_com_moby_swarmkit_v2_api_deepcopy "github.com/moby/swarmkit/v2/api/deepcopy" + raftselector "github.com/moby/swarmkit/v2/manager/raftselector" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" metadata "google.golang.org/grpc/metadata" @@ -920,61 +920,61 @@ func (m *Object) CopyFrom(src interface{}) { v := Object_Node{ Node: &Node{}, } - github_com_docker_swarmkit_api_deepcopy.Copy(v.Node, o.GetNode()) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(v.Node, o.GetNode()) m.Object = &v case *Object_Service: v := Object_Service{ Service: &Service{}, } - github_com_docker_swarmkit_api_deepcopy.Copy(v.Service, o.GetService()) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(v.Service, o.GetService()) m.Object = &v case *Object_Network: v := Object_Network{ Network: &Network{}, } - github_com_docker_swarmkit_api_deepcopy.Copy(v.Network, o.GetNetwork()) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(v.Network, o.GetNetwork()) m.Object = &v case *Object_Task: v := Object_Task{ Task: &Task{}, } - github_com_docker_swarmkit_api_deepcopy.Copy(v.Task, o.GetTask()) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(v.Task, o.GetTask()) m.Object = &v case *Object_Cluster: v := Object_Cluster{ Cluster: &Cluster{}, } - github_com_docker_swarmkit_api_deepcopy.Copy(v.Cluster, o.GetCluster()) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(v.Cluster, o.GetCluster()) m.Object = &v case *Object_Secret: v := Object_Secret{ Secret: &Secret{}, } - github_com_docker_swarmkit_api_deepcopy.Copy(v.Secret, o.GetSecret()) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(v.Secret, o.GetSecret()) m.Object = &v case *Object_Resource: v := Object_Resource{ Resource: &Resource{}, } - github_com_docker_swarmkit_api_deepcopy.Copy(v.Resource, o.GetResource()) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(v.Resource, o.GetResource()) m.Object = &v case *Object_Extension: v := Object_Extension{ Extension: &Extension{}, } - github_com_docker_swarmkit_api_deepcopy.Copy(v.Extension, o.GetExtension()) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(v.Extension, o.GetExtension()) m.Object = &v case *Object_Config: v := Object_Config{ Config: &Config{}, } - github_com_docker_swarmkit_api_deepcopy.Copy(v.Config, o.GetConfig()) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(v.Config, o.GetConfig()) m.Object = &v case *Object_Volume: v := Object_Volume{ Volume: &Volume{}, } - github_com_docker_swarmkit_api_deepcopy.Copy(v.Volume, o.GetVolume()) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(v.Volume, o.GetVolume()) m.Object = &v } } @@ -1050,13 +1050,13 @@ func (m *SelectBy) CopyFrom(src interface{}) { v := SelectBy_Custom{ Custom: &SelectByCustom{}, } - github_com_docker_swarmkit_api_deepcopy.Copy(v.Custom, o.GetCustom()) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(v.Custom, o.GetCustom()) m.By = &v case *SelectBy_CustomPrefix: v := SelectBy_CustomPrefix{ CustomPrefix: &SelectByCustom{}, } - github_com_docker_swarmkit_api_deepcopy.Copy(v.CustomPrefix, o.GetCustomPrefix()) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(v.CustomPrefix, o.GetCustomPrefix()) m.By = &v case *SelectBy_ServiceID: v := SelectBy_ServiceID{ @@ -1072,7 +1072,7 @@ func (m *SelectBy) CopyFrom(src interface{}) { v := SelectBy_Slot{ Slot: &SelectBySlot{}, } - github_com_docker_swarmkit_api_deepcopy.Copy(v.Slot, o.GetSlot()) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(v.Slot, o.GetSlot()) m.By = &v case *SelectBy_DesiredState: v := SelectBy_DesiredState{ @@ -1131,13 +1131,13 @@ func (m *WatchRequest) CopyFrom(src interface{}) { m.Entries = make([]*WatchRequest_WatchEntry, len(o.Entries)) for i := range m.Entries { m.Entries[i] = &WatchRequest_WatchEntry{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Entries[i], o.Entries[i]) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Entries[i], o.Entries[i]) } } if o.ResumeFrom != nil { m.ResumeFrom = &Version{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.ResumeFrom, o.ResumeFrom) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.ResumeFrom, o.ResumeFrom) } } @@ -1158,7 +1158,7 @@ func (m *WatchRequest_WatchEntry) CopyFrom(src interface{}) { m.Filters = make([]*SelectBy, len(o.Filters)) for i := range m.Filters { m.Filters[i] = &SelectBy{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Filters[i], o.Filters[i]) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Filters[i], o.Filters[i]) } } @@ -1181,13 +1181,13 @@ func (m *WatchMessage) CopyFrom(src interface{}) { m.Events = make([]*WatchMessage_Event, len(o.Events)) for i := range m.Events { m.Events[i] = &WatchMessage_Event{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Events[i], o.Events[i]) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Events[i], o.Events[i]) } } if o.Version != nil { m.Version = &Version{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Version, o.Version) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Version, o.Version) } } @@ -1206,11 +1206,11 @@ func (m *WatchMessage_Event) CopyFrom(src interface{}) { *m = *o if o.Object != nil { m.Object = &Object{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Object, o.Object) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Object, o.Object) } if o.OldObject != nil { m.OldObject = &Object{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.OldObject, o.OldObject) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.OldObject, o.OldObject) } } diff --git a/ca/auth.go b/ca/auth.go index e0ff898c19..40890a9699 100644 --- a/ca/auth.go +++ b/ca/auth.go @@ -8,8 +8,8 @@ import ( "github.com/sirupsen/logrus" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/log" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/log" "google.golang.org/grpc/codes" "google.golang.org/grpc/credentials" "google.golang.org/grpc/peer" diff --git a/ca/certificates.go b/ca/certificates.go index 2598057902..e15cc93360 100644 --- a/ca/certificates.go +++ b/ca/certificates.go @@ -25,10 +25,10 @@ import ( cfsigner "github.com/cloudflare/cfssl/signer" "github.com/cloudflare/cfssl/signer/local" "github.com/docker/go-events" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/ca/pkcs8" - "github.com/docker/swarmkit/connectionbroker" - "github.com/docker/swarmkit/ioutils" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/ca/pkcs8" + "github.com/moby/swarmkit/v2/connectionbroker" + "github.com/moby/swarmkit/v2/ioutils" "github.com/opencontainers/go-digest" "github.com/pkg/errors" "google.golang.org/grpc" diff --git a/ca/certificates_test.go b/ca/certificates_test.go index 4d1fd77f9d..1dc7e5450c 100644 --- a/ca/certificates_test.go +++ b/ca/certificates_test.go @@ -25,15 +25,15 @@ import ( "github.com/cloudflare/cfssl/helpers" "github.com/cloudflare/cfssl/initca" "github.com/docker/go-events" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/ca" - cautils "github.com/docker/swarmkit/ca/testutils" - "github.com/docker/swarmkit/connectionbroker" - "github.com/docker/swarmkit/identity" - "github.com/docker/swarmkit/manager/state" - "github.com/docker/swarmkit/manager/state/store" - "github.com/docker/swarmkit/remotes" - "github.com/docker/swarmkit/testutils" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/ca" + cautils "github.com/moby/swarmkit/v2/ca/testutils" + "github.com/moby/swarmkit/v2/connectionbroker" + "github.com/moby/swarmkit/v2/identity" + "github.com/moby/swarmkit/v2/manager/state" + "github.com/moby/swarmkit/v2/manager/state/store" + "github.com/moby/swarmkit/v2/remotes" + "github.com/moby/swarmkit/v2/testutils" "github.com/opencontainers/go-digest" "github.com/phayes/permbits" "github.com/stretchr/testify/assert" diff --git a/ca/config.go b/ca/config.go index 4befee5bcc..f70052bc59 100644 --- a/ca/config.go +++ b/ca/config.go @@ -15,11 +15,11 @@ import ( cfconfig "github.com/cloudflare/cfssl/config" events "github.com/docker/go-events" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/connectionbroker" - "github.com/docker/swarmkit/identity" - "github.com/docker/swarmkit/log" - "github.com/docker/swarmkit/watch" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/connectionbroker" + "github.com/moby/swarmkit/v2/identity" + "github.com/moby/swarmkit/v2/log" + "github.com/moby/swarmkit/v2/watch" "github.com/opencontainers/go-digest" "github.com/pkg/errors" "github.com/sirupsen/logrus" diff --git a/ca/config_test.go b/ca/config_test.go index 8b27ea3195..fe57d08193 100644 --- a/ca/config_test.go +++ b/ca/config_test.go @@ -18,13 +18,13 @@ import ( cfconfig "github.com/cloudflare/cfssl/config" "github.com/cloudflare/cfssl/helpers" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/ca" - cautils "github.com/docker/swarmkit/ca/testutils" - "github.com/docker/swarmkit/log" - "github.com/docker/swarmkit/manager/state" - "github.com/docker/swarmkit/manager/state/store" - "github.com/docker/swarmkit/testutils" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/ca" + cautils "github.com/moby/swarmkit/v2/ca/testutils" + "github.com/moby/swarmkit/v2/log" + "github.com/moby/swarmkit/v2/manager/state" + "github.com/moby/swarmkit/v2/manager/state/store" + "github.com/moby/swarmkit/v2/testutils" "github.com/pkg/errors" "github.com/sirupsen/logrus" "github.com/stretchr/testify/assert" diff --git a/ca/external.go b/ca/external.go index e455a6dbf7..ddf7c88767 100644 --- a/ca/external.go +++ b/ca/external.go @@ -18,7 +18,7 @@ import ( "github.com/cloudflare/cfssl/config" "github.com/cloudflare/cfssl/csr" "github.com/cloudflare/cfssl/signer" - "github.com/docker/swarmkit/log" + "github.com/moby/swarmkit/v2/log" "github.com/pkg/errors" "github.com/sirupsen/logrus" "golang.org/x/net/context/ctxhttp" diff --git a/ca/external_test.go b/ca/external_test.go index 17272dfbd5..bcf1b1ec56 100644 --- a/ca/external_test.go +++ b/ca/external_test.go @@ -10,9 +10,9 @@ import ( "time" "github.com/cloudflare/cfssl/helpers" - "github.com/docker/swarmkit/ca" - "github.com/docker/swarmkit/ca/testutils" - "github.com/docker/swarmkit/log" + "github.com/moby/swarmkit/v2/ca" + "github.com/moby/swarmkit/v2/ca/testutils" + "github.com/moby/swarmkit/v2/log" "github.com/sirupsen/logrus" "github.com/stretchr/testify/require" ) diff --git a/ca/keyreadwriter.go b/ca/keyreadwriter.go index 4e66d7e056..55f7d6ba4a 100644 --- a/ca/keyreadwriter.go +++ b/ca/keyreadwriter.go @@ -11,9 +11,9 @@ import ( "crypto/tls" - "github.com/docker/swarmkit/ca/keyutils" - "github.com/docker/swarmkit/ca/pkcs8" - "github.com/docker/swarmkit/ioutils" + "github.com/moby/swarmkit/v2/ca/keyutils" + "github.com/moby/swarmkit/v2/ca/pkcs8" + "github.com/moby/swarmkit/v2/ioutils" "github.com/pkg/errors" ) diff --git a/ca/keyreadwriter_test.go b/ca/keyreadwriter_test.go index 4eba19e1c8..ad9d58b58b 100644 --- a/ca/keyreadwriter_test.go +++ b/ca/keyreadwriter_test.go @@ -7,10 +7,10 @@ import ( "path/filepath" "testing" - "github.com/docker/swarmkit/ca" - "github.com/docker/swarmkit/ca/keyutils" - "github.com/docker/swarmkit/ca/pkcs8" - "github.com/docker/swarmkit/ca/testutils" + "github.com/moby/swarmkit/v2/ca" + "github.com/moby/swarmkit/v2/ca/keyutils" + "github.com/moby/swarmkit/v2/ca/pkcs8" + "github.com/moby/swarmkit/v2/ca/testutils" "github.com/stretchr/testify/require" ) diff --git a/ca/keyutils/keyutils.go b/ca/keyutils/keyutils.go index ea45aab7dd..8f479ea197 100644 --- a/ca/keyutils/keyutils.go +++ b/ca/keyutils/keyutils.go @@ -12,7 +12,7 @@ import ( "errors" "github.com/cloudflare/cfssl/helpers" - "github.com/docker/swarmkit/ca/pkcs8" + "github.com/moby/swarmkit/v2/ca/pkcs8" ) // Formatter provides an interface for converting keys to the right format, and encrypting and decrypting keys diff --git a/ca/reconciler.go b/ca/reconciler.go index d906475d9b..01a9558ece 100644 --- a/ca/reconciler.go +++ b/ca/reconciler.go @@ -9,10 +9,10 @@ import ( "time" "github.com/cloudflare/cfssl/helpers" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/api/equality" - "github.com/docker/swarmkit/log" - "github.com/docker/swarmkit/manager/state/store" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/api/equality" + "github.com/moby/swarmkit/v2/log" + "github.com/moby/swarmkit/v2/manager/state/store" "github.com/pkg/errors" ) diff --git a/ca/renewer.go b/ca/renewer.go index e5d165f6a8..f5c9780ae6 100644 --- a/ca/renewer.go +++ b/ca/renewer.go @@ -6,8 +6,8 @@ import ( "time" "github.com/docker/go-events" - "github.com/docker/swarmkit/connectionbroker" - "github.com/docker/swarmkit/log" + "github.com/moby/swarmkit/v2/connectionbroker" + "github.com/moby/swarmkit/v2/log" "github.com/pkg/errors" "github.com/sirupsen/logrus" ) diff --git a/ca/renewer_test.go b/ca/renewer_test.go index a0f3cd3258..02f6e440a4 100644 --- a/ca/renewer_test.go +++ b/ca/renewer_test.go @@ -5,10 +5,10 @@ import ( "testing" "time" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/ca" - "github.com/docker/swarmkit/ca/testutils" - "github.com/docker/swarmkit/manager/state/store" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/ca" + "github.com/moby/swarmkit/v2/ca/testutils" + "github.com/moby/swarmkit/v2/manager/state/store" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/ca/server.go b/ca/server.go index 01959972e9..fc6aeff4d7 100644 --- a/ca/server.go +++ b/ca/server.go @@ -8,11 +8,11 @@ import ( "sync" "time" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/api/equality" - "github.com/docker/swarmkit/identity" - "github.com/docker/swarmkit/log" - "github.com/docker/swarmkit/manager/state/store" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/api/equality" + "github.com/moby/swarmkit/v2/identity" + "github.com/moby/swarmkit/v2/log" + "github.com/moby/swarmkit/v2/manager/state/store" gogotypes "github.com/gogo/protobuf/types" "github.com/pkg/errors" "github.com/sirupsen/logrus" diff --git a/ca/server_test.go b/ca/server_test.go index 0d0d880bdb..081c02ad6a 100644 --- a/ca/server_test.go +++ b/ca/server_test.go @@ -13,13 +13,13 @@ import ( "time" "github.com/cloudflare/cfssl/helpers" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/api/equality" - "github.com/docker/swarmkit/ca" - cautils "github.com/docker/swarmkit/ca/testutils" - "github.com/docker/swarmkit/log" - "github.com/docker/swarmkit/manager/state/store" - "github.com/docker/swarmkit/testutils" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/api/equality" + "github.com/moby/swarmkit/v2/ca" + cautils "github.com/moby/swarmkit/v2/ca/testutils" + "github.com/moby/swarmkit/v2/log" + "github.com/moby/swarmkit/v2/manager/state/store" + "github.com/moby/swarmkit/v2/testutils" "github.com/opencontainers/go-digest" "github.com/pkg/errors" "github.com/sirupsen/logrus" diff --git a/ca/testutils/cautils.go b/ca/testutils/cautils.go index 9927b84c68..2715c7629d 100644 --- a/ca/testutils/cautils.go +++ b/ca/testutils/cautils.go @@ -16,16 +16,16 @@ import ( cfcsr "github.com/cloudflare/cfssl/csr" "github.com/cloudflare/cfssl/helpers" "github.com/cloudflare/cfssl/initca" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/ca" - "github.com/docker/swarmkit/ca/pkcs8" - "github.com/docker/swarmkit/connectionbroker" - "github.com/docker/swarmkit/identity" - "github.com/docker/swarmkit/ioutils" - "github.com/docker/swarmkit/log" - "github.com/docker/swarmkit/manager/state/store" - stateutils "github.com/docker/swarmkit/manager/state/testutils" - "github.com/docker/swarmkit/remotes" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/ca" + "github.com/moby/swarmkit/v2/ca/pkcs8" + "github.com/moby/swarmkit/v2/connectionbroker" + "github.com/moby/swarmkit/v2/identity" + "github.com/moby/swarmkit/v2/ioutils" + "github.com/moby/swarmkit/v2/log" + "github.com/moby/swarmkit/v2/manager/state/store" + stateutils "github.com/moby/swarmkit/v2/manager/state/testutils" + "github.com/moby/swarmkit/v2/remotes" "github.com/sirupsen/logrus" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/ca/testutils/externalutils.go b/ca/testutils/externalutils.go index 8fc22374c1..3d63f8dda7 100644 --- a/ca/testutils/externalutils.go +++ b/ca/testutils/externalutils.go @@ -16,7 +16,7 @@ import ( "github.com/cloudflare/cfssl/config" cfsslerrors "github.com/cloudflare/cfssl/errors" "github.com/cloudflare/cfssl/signer" - "github.com/docker/swarmkit/ca" + "github.com/moby/swarmkit/v2/ca" "github.com/pkg/errors" ) diff --git a/cli/external_ca.go b/cli/external_ca.go index 737cd18e31..d4c0eb29a9 100644 --- a/cli/external_ca.go +++ b/cli/external_ca.go @@ -6,7 +6,7 @@ import ( "fmt" "strings" - "github.com/docker/swarmkit/api" + "github.com/moby/swarmkit/v2/api" ) // ExternalCAOpt is a Value type for parsing external CA specifications. diff --git a/cli/external_ca_test.go b/cli/external_ca_test.go index 929c9b5cab..f914c3a44f 100644 --- a/cli/external_ca_test.go +++ b/cli/external_ca_test.go @@ -3,7 +3,7 @@ package cli import ( "testing" - "github.com/docker/swarmkit/api" + "github.com/moby/swarmkit/v2/api" "github.com/stretchr/testify/assert" ) diff --git a/cmd/external-ca-example/main.go b/cmd/external-ca-example/main.go index 9753878cb9..fff9a7aee3 100644 --- a/cmd/external-ca-example/main.go +++ b/cmd/external-ca-example/main.go @@ -6,9 +6,9 @@ import ( "path/filepath" "syscall" - "github.com/docker/swarmkit/ca" - "github.com/docker/swarmkit/ca/testutils" - "github.com/docker/swarmkit/identity" + "github.com/moby/swarmkit/v2/ca" + "github.com/moby/swarmkit/v2/ca/testutils" + "github.com/moby/swarmkit/v2/identity" "github.com/sirupsen/logrus" ) diff --git a/cmd/protoc-gen-gogoswarm/main.go b/cmd/protoc-gen-gogoswarm/main.go index 72e7a1fe10..28264572b6 100644 --- a/cmd/protoc-gen-gogoswarm/main.go +++ b/cmd/protoc-gen-gogoswarm/main.go @@ -1,10 +1,10 @@ package main import ( - _ "github.com/docker/swarmkit/protobuf/plugin/authenticatedwrapper" - _ "github.com/docker/swarmkit/protobuf/plugin/deepcopy" - _ "github.com/docker/swarmkit/protobuf/plugin/raftproxy" - _ "github.com/docker/swarmkit/protobuf/plugin/storeobject" + _ "github.com/moby/swarmkit/v2/protobuf/plugin/authenticatedwrapper" + _ "github.com/moby/swarmkit/v2/protobuf/plugin/deepcopy" + _ "github.com/moby/swarmkit/v2/protobuf/plugin/raftproxy" + _ "github.com/moby/swarmkit/v2/protobuf/plugin/storeobject" "github.com/gogo/protobuf/protoc-gen-gogo/descriptor" "github.com/gogo/protobuf/vanity" "github.com/gogo/protobuf/vanity/command" diff --git a/cmd/swarm-bench/benchmark.go b/cmd/swarm-bench/benchmark.go index 312649e502..6d119f7a49 100644 --- a/cmd/swarm-bench/benchmark.go +++ b/cmd/swarm-bench/benchmark.go @@ -7,7 +7,7 @@ import ( "strconv" "time" - "github.com/docker/swarmkit/api" + "github.com/moby/swarmkit/v2/api" "google.golang.org/grpc" ) diff --git a/cmd/swarm-bench/collector.go b/cmd/swarm-bench/collector.go index 7c886bbec9..ae475c3fa8 100644 --- a/cmd/swarm-bench/collector.go +++ b/cmd/swarm-bench/collector.go @@ -8,7 +8,7 @@ import ( "strconv" "time" - "github.com/docker/swarmkit/log" + "github.com/moby/swarmkit/v2/log" "github.com/rcrowley/go-metrics" ) diff --git a/cmd/swarm-rafttool/common.go b/cmd/swarm-rafttool/common.go index 913c9659fe..58f8afa96f 100644 --- a/cmd/swarm-rafttool/common.go +++ b/cmd/swarm-rafttool/common.go @@ -6,11 +6,11 @@ import ( "os" "path/filepath" - "github.com/docker/swarmkit/ca" - "github.com/docker/swarmkit/manager" - "github.com/docker/swarmkit/manager/encryption" - "github.com/docker/swarmkit/manager/state/raft/storage" - "github.com/docker/swarmkit/node" + "github.com/moby/swarmkit/v2/ca" + "github.com/moby/swarmkit/v2/manager" + "github.com/moby/swarmkit/v2/manager/encryption" + "github.com/moby/swarmkit/v2/manager/state/raft/storage" + "github.com/moby/swarmkit/v2/node" "go.etcd.io/etcd/client/pkg/v3/fileutil" "go.etcd.io/etcd/server/v3/wal/walpb" ) diff --git a/cmd/swarm-rafttool/common_test.go b/cmd/swarm-rafttool/common_test.go index 9c4a004bf1..5fd4fca27d 100644 --- a/cmd/swarm-rafttool/common_test.go +++ b/cmd/swarm-rafttool/common_test.go @@ -6,12 +6,12 @@ import ( "path/filepath" "testing" - "github.com/docker/swarmkit/ca" - "github.com/docker/swarmkit/ca/testutils" - "github.com/docker/swarmkit/manager" - "github.com/docker/swarmkit/manager/encryption" - "github.com/docker/swarmkit/manager/state/raft" - "github.com/docker/swarmkit/manager/state/raft/storage" + "github.com/moby/swarmkit/v2/ca" + "github.com/moby/swarmkit/v2/ca/testutils" + "github.com/moby/swarmkit/v2/manager" + "github.com/moby/swarmkit/v2/manager/encryption" + "github.com/moby/swarmkit/v2/manager/state/raft" + "github.com/moby/swarmkit/v2/manager/state/raft/storage" "github.com/stretchr/testify/require" "go.etcd.io/etcd/client/pkg/v3/fileutil" "go.etcd.io/etcd/raft/v3/raftpb" diff --git a/cmd/swarm-rafttool/dump.go b/cmd/swarm-rafttool/dump.go index 6feed8ab4d..11f497d9e4 100644 --- a/cmd/swarm-rafttool/dump.go +++ b/cmd/swarm-rafttool/dump.go @@ -7,10 +7,10 @@ import ( "os" "path/filepath" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/manager/encryption" - "github.com/docker/swarmkit/manager/state/raft/storage" - "github.com/docker/swarmkit/manager/state/store" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/manager/encryption" + "github.com/moby/swarmkit/v2/manager/state/raft/storage" + "github.com/moby/swarmkit/v2/manager/state/store" "github.com/gogo/protobuf/proto" "go.etcd.io/etcd/raft/v3/raftpb" "go.etcd.io/etcd/server/v3/etcdserver/api/snap" diff --git a/cmd/swarm-rafttool/main.go b/cmd/swarm-rafttool/main.go index a5d2963c6e..0648813b45 100644 --- a/cmd/swarm-rafttool/main.go +++ b/cmd/swarm-rafttool/main.go @@ -5,7 +5,7 @@ import ( "fmt" "os" - "github.com/docker/swarmkit/cmd/swarmd/defaults" + "github.com/moby/swarmkit/v2/cmd/swarmd/defaults" "github.com/spf13/cobra" ) diff --git a/cmd/swarmctl/cluster/common.go b/cmd/swarmctl/cluster/common.go index a667d05fbd..815b28ab7d 100644 --- a/cmd/swarmctl/cluster/common.go +++ b/cmd/swarmctl/cluster/common.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/docker/swarmkit/api" + "github.com/moby/swarmkit/v2/api" ) func getCluster(ctx context.Context, c api.ControlClient, input string) (*api.Cluster, error) { diff --git a/cmd/swarmctl/cluster/inspect.go b/cmd/swarmctl/cluster/inspect.go index 409b3d0dcf..025886b439 100644 --- a/cmd/swarmctl/cluster/inspect.go +++ b/cmd/swarmctl/cluster/inspect.go @@ -7,8 +7,8 @@ import ( "sort" "text/tabwriter" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/cmd/swarmctl/common" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/cmd/swarmctl/common" gogotypes "github.com/gogo/protobuf/types" "github.com/spf13/cobra" ) diff --git a/cmd/swarmctl/cluster/list.go b/cmd/swarmctl/cluster/list.go index 3ad77ecb08..9c79f697a8 100644 --- a/cmd/swarmctl/cluster/list.go +++ b/cmd/swarmctl/cluster/list.go @@ -6,8 +6,8 @@ import ( "os" "text/tabwriter" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/cmd/swarmctl/common" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/cmd/swarmctl/common" "github.com/spf13/cobra" ) diff --git a/cmd/swarmctl/cluster/unlockkey.go b/cmd/swarmctl/cluster/unlockkey.go index 808dd56ad9..23aafe5e41 100644 --- a/cmd/swarmctl/cluster/unlockkey.go +++ b/cmd/swarmctl/cluster/unlockkey.go @@ -4,9 +4,9 @@ import ( "errors" "fmt" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/cmd/swarmctl/common" - "github.com/docker/swarmkit/manager/encryption" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/cmd/swarmctl/common" + "github.com/moby/swarmkit/v2/manager/encryption" "github.com/spf13/cobra" ) diff --git a/cmd/swarmctl/cluster/update.go b/cmd/swarmctl/cluster/update.go index defaf86c78..34a99d8639 100644 --- a/cmd/swarmctl/cluster/update.go +++ b/cmd/swarmctl/cluster/update.go @@ -6,9 +6,9 @@ import ( "strings" "time" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/cli" - "github.com/docker/swarmkit/cmd/swarmctl/common" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/cli" + "github.com/moby/swarmkit/v2/cmd/swarmctl/common" gogotypes "github.com/gogo/protobuf/types" "github.com/spf13/cobra" ) diff --git a/cmd/swarmctl/common/common.go b/cmd/swarmctl/common/common.go index 4f27e1a670..2179e2755c 100644 --- a/cmd/swarmctl/common/common.go +++ b/cmd/swarmctl/common/common.go @@ -7,8 +7,8 @@ import ( "strings" "time" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/xnet" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/xnet" "github.com/spf13/cobra" "github.com/spf13/pflag" "google.golang.org/grpc" diff --git a/cmd/swarmctl/common/resolver.go b/cmd/swarmctl/common/resolver.go index b4a9d416a1..fa73b5eaf6 100644 --- a/cmd/swarmctl/common/resolver.go +++ b/cmd/swarmctl/common/resolver.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/docker/swarmkit/api" + "github.com/moby/swarmkit/v2/api" "github.com/spf13/cobra" ) diff --git a/cmd/swarmctl/config/common.go b/cmd/swarmctl/config/common.go index bbdc1d5c29..812d9d02af 100644 --- a/cmd/swarmctl/config/common.go +++ b/cmd/swarmctl/config/common.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/docker/swarmkit/api" + "github.com/moby/swarmkit/v2/api" ) func getConfig(ctx context.Context, c api.ControlClient, input string) (*api.Config, error) { diff --git a/cmd/swarmctl/config/create.go b/cmd/swarmctl/config/create.go index da862f5e18..148ca72cbb 100644 --- a/cmd/swarmctl/config/create.go +++ b/cmd/swarmctl/config/create.go @@ -6,8 +6,8 @@ import ( "io" "os" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/cmd/swarmctl/common" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/cmd/swarmctl/common" "github.com/spf13/cobra" ) diff --git a/cmd/swarmctl/config/inspect.go b/cmd/swarmctl/config/inspect.go index ee2a79dfe5..e290957c39 100644 --- a/cmd/swarmctl/config/inspect.go +++ b/cmd/swarmctl/config/inspect.go @@ -6,8 +6,8 @@ import ( "os" "text/tabwriter" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/cmd/swarmctl/common" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/cmd/swarmctl/common" gogotypes "github.com/gogo/protobuf/types" "github.com/spf13/cobra" ) diff --git a/cmd/swarmctl/config/list.go b/cmd/swarmctl/config/list.go index e96e54cd82..22942c5017 100644 --- a/cmd/swarmctl/config/list.go +++ b/cmd/swarmctl/config/list.go @@ -7,8 +7,8 @@ import ( "sort" "text/tabwriter" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/cmd/swarmctl/common" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/cmd/swarmctl/common" "github.com/dustin/go-humanize" gogotypes "github.com/gogo/protobuf/types" "github.com/spf13/cobra" diff --git a/cmd/swarmctl/config/remove.go b/cmd/swarmctl/config/remove.go index 517fd79882..9b2647219e 100644 --- a/cmd/swarmctl/config/remove.go +++ b/cmd/swarmctl/config/remove.go @@ -4,8 +4,8 @@ import ( "errors" "fmt" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/cmd/swarmctl/common" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/cmd/swarmctl/common" "github.com/spf13/cobra" ) diff --git a/cmd/swarmctl/main.go b/cmd/swarmctl/main.go index 692ac4ccea..7bc0d42c80 100644 --- a/cmd/swarmctl/main.go +++ b/cmd/swarmctl/main.go @@ -3,15 +3,15 @@ package main import ( "os" - "github.com/docker/swarmkit/cmd/swarmctl/cluster" - "github.com/docker/swarmkit/cmd/swarmctl/config" - "github.com/docker/swarmkit/cmd/swarmctl/network" - "github.com/docker/swarmkit/cmd/swarmctl/node" - "github.com/docker/swarmkit/cmd/swarmctl/secret" - "github.com/docker/swarmkit/cmd/swarmctl/service" - "github.com/docker/swarmkit/cmd/swarmctl/task" - "github.com/docker/swarmkit/cmd/swarmd/defaults" - "github.com/docker/swarmkit/version" + "github.com/moby/swarmkit/v2/cmd/swarmctl/cluster" + "github.com/moby/swarmkit/v2/cmd/swarmctl/config" + "github.com/moby/swarmkit/v2/cmd/swarmctl/network" + "github.com/moby/swarmkit/v2/cmd/swarmctl/node" + "github.com/moby/swarmkit/v2/cmd/swarmctl/secret" + "github.com/moby/swarmkit/v2/cmd/swarmctl/service" + "github.com/moby/swarmkit/v2/cmd/swarmctl/task" + "github.com/moby/swarmkit/v2/cmd/swarmd/defaults" + "github.com/moby/swarmkit/v2/version" "github.com/spf13/cobra" "google.golang.org/grpc/status" ) diff --git a/cmd/swarmctl/network/common.go b/cmd/swarmctl/network/common.go index ad2c68bd73..f819c834c9 100644 --- a/cmd/swarmctl/network/common.go +++ b/cmd/swarmctl/network/common.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/docker/swarmkit/api" + "github.com/moby/swarmkit/v2/api" ) // GetNetwork tries to query for a network as an ID and if it can't be diff --git a/cmd/swarmctl/network/create.go b/cmd/swarmctl/network/create.go index 94de630b60..6acee380f9 100644 --- a/cmd/swarmctl/network/create.go +++ b/cmd/swarmctl/network/create.go @@ -6,8 +6,8 @@ import ( "net" "strings" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/cmd/swarmctl/common" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/cmd/swarmctl/common" "github.com/spf13/cobra" ) diff --git a/cmd/swarmctl/network/inspect.go b/cmd/swarmctl/network/inspect.go index 8a72596d14..f45c52da13 100644 --- a/cmd/swarmctl/network/inspect.go +++ b/cmd/swarmctl/network/inspect.go @@ -6,8 +6,8 @@ import ( "os" "text/tabwriter" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/cmd/swarmctl/common" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/cmd/swarmctl/common" "github.com/spf13/cobra" ) diff --git a/cmd/swarmctl/network/list.go b/cmd/swarmctl/network/list.go index 02f3414a1d..9d4a829305 100644 --- a/cmd/swarmctl/network/list.go +++ b/cmd/swarmctl/network/list.go @@ -6,8 +6,8 @@ import ( "os" "text/tabwriter" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/cmd/swarmctl/common" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/cmd/swarmctl/common" "github.com/spf13/cobra" ) diff --git a/cmd/swarmctl/network/remove.go b/cmd/swarmctl/network/remove.go index 2630e63350..f41c7223ae 100644 --- a/cmd/swarmctl/network/remove.go +++ b/cmd/swarmctl/network/remove.go @@ -4,8 +4,8 @@ import ( "errors" "fmt" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/cmd/swarmctl/common" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/cmd/swarmctl/common" "github.com/spf13/cobra" ) diff --git a/cmd/swarmctl/node/activate.go b/cmd/swarmctl/node/activate.go index 877b72b582..d1efda53b3 100644 --- a/cmd/swarmctl/node/activate.go +++ b/cmd/swarmctl/node/activate.go @@ -3,7 +3,7 @@ package node import ( "fmt" - "github.com/docker/swarmkit/api" + "github.com/moby/swarmkit/v2/api" "github.com/spf13/cobra" ) diff --git a/cmd/swarmctl/node/common.go b/cmd/swarmctl/node/common.go index c70384817a..80dab52142 100644 --- a/cmd/swarmctl/node/common.go +++ b/cmd/swarmctl/node/common.go @@ -7,8 +7,8 @@ import ( "reflect" "strings" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/cmd/swarmctl/common" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/cmd/swarmctl/common" "github.com/spf13/cobra" ) diff --git a/cmd/swarmctl/node/demote.go b/cmd/swarmctl/node/demote.go index 6f998a69b7..b0b32511d5 100644 --- a/cmd/swarmctl/node/demote.go +++ b/cmd/swarmctl/node/demote.go @@ -3,7 +3,7 @@ package node import ( "fmt" - "github.com/docker/swarmkit/api" + "github.com/moby/swarmkit/v2/api" "github.com/spf13/cobra" ) diff --git a/cmd/swarmctl/node/drain.go b/cmd/swarmctl/node/drain.go index 94459c92bd..1f6fb28a21 100644 --- a/cmd/swarmctl/node/drain.go +++ b/cmd/swarmctl/node/drain.go @@ -3,7 +3,7 @@ package node import ( "fmt" - "github.com/docker/swarmkit/api" + "github.com/moby/swarmkit/v2/api" "github.com/spf13/cobra" ) diff --git a/cmd/swarmctl/node/inspect.go b/cmd/swarmctl/node/inspect.go index 07c6675160..ae16ac9ed5 100644 --- a/cmd/swarmctl/node/inspect.go +++ b/cmd/swarmctl/node/inspect.go @@ -7,10 +7,10 @@ import ( "sort" "text/tabwriter" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/api/genericresource" - "github.com/docker/swarmkit/cmd/swarmctl/common" - "github.com/docker/swarmkit/cmd/swarmctl/task" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/api/genericresource" + "github.com/moby/swarmkit/v2/cmd/swarmctl/common" + "github.com/moby/swarmkit/v2/cmd/swarmctl/task" "github.com/dustin/go-humanize" "github.com/spf13/cobra" ) diff --git a/cmd/swarmctl/node/list.go b/cmd/swarmctl/node/list.go index 3e577a8bab..1dba9d63bd 100644 --- a/cmd/swarmctl/node/list.go +++ b/cmd/swarmctl/node/list.go @@ -6,8 +6,8 @@ import ( "os" "text/tabwriter" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/cmd/swarmctl/common" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/cmd/swarmctl/common" "github.com/spf13/cobra" ) diff --git a/cmd/swarmctl/node/pause.go b/cmd/swarmctl/node/pause.go index d56a37c6cf..039521978c 100644 --- a/cmd/swarmctl/node/pause.go +++ b/cmd/swarmctl/node/pause.go @@ -3,7 +3,7 @@ package node import ( "fmt" - "github.com/docker/swarmkit/api" + "github.com/moby/swarmkit/v2/api" "github.com/spf13/cobra" ) diff --git a/cmd/swarmctl/node/promote.go b/cmd/swarmctl/node/promote.go index c84a9ce28e..d3e892faa6 100644 --- a/cmd/swarmctl/node/promote.go +++ b/cmd/swarmctl/node/promote.go @@ -3,7 +3,7 @@ package node import ( "fmt" - "github.com/docker/swarmkit/api" + "github.com/moby/swarmkit/v2/api" "github.com/spf13/cobra" ) diff --git a/cmd/swarmctl/node/remove.go b/cmd/swarmctl/node/remove.go index 4e0c7e72b9..225d10175a 100644 --- a/cmd/swarmctl/node/remove.go +++ b/cmd/swarmctl/node/remove.go @@ -3,8 +3,8 @@ package node import ( "errors" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/cmd/swarmctl/common" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/cmd/swarmctl/common" "github.com/spf13/cobra" ) diff --git a/cmd/swarmctl/secret/common.go b/cmd/swarmctl/secret/common.go index 5f7ca4e888..79e00bac41 100644 --- a/cmd/swarmctl/secret/common.go +++ b/cmd/swarmctl/secret/common.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/docker/swarmkit/api" + "github.com/moby/swarmkit/v2/api" ) func getSecret(ctx context.Context, c api.ControlClient, input string) (*api.Secret, error) { diff --git a/cmd/swarmctl/secret/create.go b/cmd/swarmctl/secret/create.go index 69ac1ced0a..cd7f975ef1 100644 --- a/cmd/swarmctl/secret/create.go +++ b/cmd/swarmctl/secret/create.go @@ -6,8 +6,8 @@ import ( "io" "os" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/cmd/swarmctl/common" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/cmd/swarmctl/common" "github.com/spf13/cobra" ) diff --git a/cmd/swarmctl/secret/inspect.go b/cmd/swarmctl/secret/inspect.go index 32f48488e8..1adcbc8d9f 100644 --- a/cmd/swarmctl/secret/inspect.go +++ b/cmd/swarmctl/secret/inspect.go @@ -6,8 +6,8 @@ import ( "os" "text/tabwriter" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/cmd/swarmctl/common" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/cmd/swarmctl/common" gogotypes "github.com/gogo/protobuf/types" "github.com/spf13/cobra" ) diff --git a/cmd/swarmctl/secret/list.go b/cmd/swarmctl/secret/list.go index 8f2faf64f8..5ec4df3180 100644 --- a/cmd/swarmctl/secret/list.go +++ b/cmd/swarmctl/secret/list.go @@ -7,8 +7,8 @@ import ( "sort" "text/tabwriter" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/cmd/swarmctl/common" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/cmd/swarmctl/common" "github.com/dustin/go-humanize" gogotypes "github.com/gogo/protobuf/types" "github.com/spf13/cobra" diff --git a/cmd/swarmctl/secret/remove.go b/cmd/swarmctl/secret/remove.go index 517ae6e7d6..c2abc533dd 100644 --- a/cmd/swarmctl/secret/remove.go +++ b/cmd/swarmctl/secret/remove.go @@ -4,8 +4,8 @@ import ( "errors" "fmt" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/cmd/swarmctl/common" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/cmd/swarmctl/common" "github.com/spf13/cobra" ) diff --git a/cmd/swarmctl/service/common.go b/cmd/swarmctl/service/common.go index 5d5db81fb0..4d95008d54 100644 --- a/cmd/swarmctl/service/common.go +++ b/cmd/swarmctl/service/common.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/docker/swarmkit/api" + "github.com/moby/swarmkit/v2/api" ) func getService(ctx context.Context, c api.ControlClient, input string) (*api.Service, error) { diff --git a/cmd/swarmctl/service/create.go b/cmd/swarmctl/service/create.go index 3877bab5ed..1b0cd0efa9 100644 --- a/cmd/swarmctl/service/create.go +++ b/cmd/swarmctl/service/create.go @@ -4,9 +4,9 @@ import ( "errors" "fmt" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/cmd/swarmctl/common" - "github.com/docker/swarmkit/cmd/swarmctl/service/flagparser" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/cmd/swarmctl/common" + "github.com/moby/swarmkit/v2/cmd/swarmctl/service/flagparser" "github.com/spf13/cobra" ) diff --git a/cmd/swarmctl/service/flagparser/bind.go b/cmd/swarmctl/service/flagparser/bind.go index 424cc70e6b..e3a86a81b1 100644 --- a/cmd/swarmctl/service/flagparser/bind.go +++ b/cmd/swarmctl/service/flagparser/bind.go @@ -4,7 +4,7 @@ import ( "fmt" "strings" - "github.com/docker/swarmkit/api" + "github.com/moby/swarmkit/v2/api" "github.com/spf13/pflag" ) diff --git a/cmd/swarmctl/service/flagparser/capability.go b/cmd/swarmctl/service/flagparser/capability.go index f34d819cdd..e291bceb2c 100644 --- a/cmd/swarmctl/service/flagparser/capability.go +++ b/cmd/swarmctl/service/flagparser/capability.go @@ -1,7 +1,7 @@ package flagparser import ( - "github.com/docker/swarmkit/api" + "github.com/moby/swarmkit/v2/api" "github.com/spf13/cobra" ) diff --git a/cmd/swarmctl/service/flagparser/config.go b/cmd/swarmctl/service/flagparser/config.go index 14bf9538f3..13c4ee8356 100644 --- a/cmd/swarmctl/service/flagparser/config.go +++ b/cmd/swarmctl/service/flagparser/config.go @@ -4,8 +4,8 @@ import ( "fmt" "strings" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/cmd/swarmctl/common" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/cmd/swarmctl/common" "github.com/spf13/cobra" ) diff --git a/cmd/swarmctl/service/flagparser/container.go b/cmd/swarmctl/service/flagparser/container.go index 1507a16812..b02d7a80d8 100644 --- a/cmd/swarmctl/service/flagparser/container.go +++ b/cmd/swarmctl/service/flagparser/container.go @@ -1,7 +1,7 @@ package flagparser import ( - "github.com/docker/swarmkit/api" + "github.com/moby/swarmkit/v2/api" gogotypes "github.com/gogo/protobuf/types" "github.com/spf13/pflag" ) diff --git a/cmd/swarmctl/service/flagparser/flags.go b/cmd/swarmctl/service/flagparser/flags.go index 302705baed..ef1765a0a6 100644 --- a/cmd/swarmctl/service/flagparser/flags.go +++ b/cmd/swarmctl/service/flagparser/flags.go @@ -4,8 +4,8 @@ import ( "fmt" "strings" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/cmd/swarmctl/common" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/cmd/swarmctl/common" "github.com/spf13/cobra" "github.com/spf13/pflag" ) diff --git a/cmd/swarmctl/service/flagparser/mode.go b/cmd/swarmctl/service/flagparser/mode.go index 4b55150783..353c7a183a 100644 --- a/cmd/swarmctl/service/flagparser/mode.go +++ b/cmd/swarmctl/service/flagparser/mode.go @@ -3,7 +3,7 @@ package flagparser import ( "fmt" - "github.com/docker/swarmkit/api" + "github.com/moby/swarmkit/v2/api" "github.com/spf13/pflag" ) diff --git a/cmd/swarmctl/service/flagparser/network.go b/cmd/swarmctl/service/flagparser/network.go index 4df67e7499..81e2e8a161 100644 --- a/cmd/swarmctl/service/flagparser/network.go +++ b/cmd/swarmctl/service/flagparser/network.go @@ -1,9 +1,9 @@ package flagparser import ( - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/cmd/swarmctl/common" - "github.com/docker/swarmkit/cmd/swarmctl/network" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/cmd/swarmctl/common" + "github.com/moby/swarmkit/v2/cmd/swarmctl/network" "github.com/spf13/cobra" ) diff --git a/cmd/swarmctl/service/flagparser/npipe.go b/cmd/swarmctl/service/flagparser/npipe.go index 6a69bc0f0e..3db6075d34 100644 --- a/cmd/swarmctl/service/flagparser/npipe.go +++ b/cmd/swarmctl/service/flagparser/npipe.go @@ -4,7 +4,7 @@ import ( "fmt" "strings" - "github.com/docker/swarmkit/api" + "github.com/moby/swarmkit/v2/api" "github.com/spf13/pflag" ) diff --git a/cmd/swarmctl/service/flagparser/placement.go b/cmd/swarmctl/service/flagparser/placement.go index 73782d965c..279a509873 100644 --- a/cmd/swarmctl/service/flagparser/placement.go +++ b/cmd/swarmctl/service/flagparser/placement.go @@ -3,7 +3,7 @@ package flagparser import ( "fmt" - "github.com/docker/swarmkit/api" + "github.com/moby/swarmkit/v2/api" "github.com/spf13/pflag" ) diff --git a/cmd/swarmctl/service/flagparser/port.go b/cmd/swarmctl/service/flagparser/port.go index c0b8166d0a..ac95892b31 100644 --- a/cmd/swarmctl/service/flagparser/port.go +++ b/cmd/swarmctl/service/flagparser/port.go @@ -4,7 +4,7 @@ import ( "strconv" "strings" - "github.com/docker/swarmkit/api" + "github.com/moby/swarmkit/v2/api" "github.com/pkg/errors" "github.com/spf13/pflag" ) diff --git a/cmd/swarmctl/service/flagparser/resource.go b/cmd/swarmctl/service/flagparser/resource.go index 395fdbda3c..1c0ae407a5 100644 --- a/cmd/swarmctl/service/flagparser/resource.go +++ b/cmd/swarmctl/service/flagparser/resource.go @@ -5,8 +5,8 @@ import ( "math/big" "github.com/docker/go-units" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/api/genericresource" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/api/genericresource" "github.com/spf13/pflag" ) diff --git a/cmd/swarmctl/service/flagparser/restart.go b/cmd/swarmctl/service/flagparser/restart.go index 7ee305a23f..71427aa0d3 100644 --- a/cmd/swarmctl/service/flagparser/restart.go +++ b/cmd/swarmctl/service/flagparser/restart.go @@ -4,7 +4,7 @@ import ( "fmt" "time" - "github.com/docker/swarmkit/api" + "github.com/moby/swarmkit/v2/api" gogotypes "github.com/gogo/protobuf/types" "github.com/spf13/pflag" ) diff --git a/cmd/swarmctl/service/flagparser/secret.go b/cmd/swarmctl/service/flagparser/secret.go index 66ca1f2f47..8dabfa8485 100644 --- a/cmd/swarmctl/service/flagparser/secret.go +++ b/cmd/swarmctl/service/flagparser/secret.go @@ -4,8 +4,8 @@ import ( "fmt" "strings" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/cmd/swarmctl/common" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/cmd/swarmctl/common" "github.com/spf13/cobra" ) diff --git a/cmd/swarmctl/service/flagparser/tmpfs.go b/cmd/swarmctl/service/flagparser/tmpfs.go index 8b42696082..e0f90188e4 100644 --- a/cmd/swarmctl/service/flagparser/tmpfs.go +++ b/cmd/swarmctl/service/flagparser/tmpfs.go @@ -6,7 +6,7 @@ import ( "strconv" "strings" - "github.com/docker/swarmkit/api" + "github.com/moby/swarmkit/v2/api" "github.com/pkg/errors" "github.com/spf13/pflag" ) diff --git a/cmd/swarmctl/service/flagparser/update.go b/cmd/swarmctl/service/flagparser/update.go index 6749894a27..2a2e575304 100644 --- a/cmd/swarmctl/service/flagparser/update.go +++ b/cmd/swarmctl/service/flagparser/update.go @@ -4,7 +4,7 @@ import ( "errors" "time" - "github.com/docker/swarmkit/api" + "github.com/moby/swarmkit/v2/api" "github.com/spf13/pflag" ) diff --git a/cmd/swarmctl/service/flagparser/volume.go b/cmd/swarmctl/service/flagparser/volume.go index 4fc9af5819..30b1fc2a2f 100644 --- a/cmd/swarmctl/service/flagparser/volume.go +++ b/cmd/swarmctl/service/flagparser/volume.go @@ -4,7 +4,7 @@ import ( "fmt" "strings" - "github.com/docker/swarmkit/api" + "github.com/moby/swarmkit/v2/api" "github.com/spf13/pflag" ) diff --git a/cmd/swarmctl/service/inspect.go b/cmd/swarmctl/service/inspect.go index 08eb57d329..28ffb2fd3b 100644 --- a/cmd/swarmctl/service/inspect.go +++ b/cmd/swarmctl/service/inspect.go @@ -9,10 +9,10 @@ import ( "strings" "text/tabwriter" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/api/genericresource" - "github.com/docker/swarmkit/cmd/swarmctl/common" - "github.com/docker/swarmkit/cmd/swarmctl/task" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/api/genericresource" + "github.com/moby/swarmkit/v2/cmd/swarmctl/common" + "github.com/moby/swarmkit/v2/cmd/swarmctl/task" "github.com/dustin/go-humanize" gogotypes "github.com/gogo/protobuf/types" "github.com/spf13/cobra" diff --git a/cmd/swarmctl/service/list.go b/cmd/swarmctl/service/list.go index 564836ce7f..0e15d3574c 100644 --- a/cmd/swarmctl/service/list.go +++ b/cmd/swarmctl/service/list.go @@ -6,8 +6,8 @@ import ( "os" "text/tabwriter" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/cmd/swarmctl/common" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/cmd/swarmctl/common" "github.com/spf13/cobra" ) diff --git a/cmd/swarmctl/service/logs.go b/cmd/swarmctl/service/logs.go index 12ba7af664..84753859e8 100644 --- a/cmd/swarmctl/service/logs.go +++ b/cmd/swarmctl/service/logs.go @@ -6,8 +6,8 @@ import ( "io" "os" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/cmd/swarmctl/common" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/cmd/swarmctl/common" "github.com/pkg/errors" "github.com/spf13/cobra" ) diff --git a/cmd/swarmctl/service/remove.go b/cmd/swarmctl/service/remove.go index 60685c98a9..576450ff45 100644 --- a/cmd/swarmctl/service/remove.go +++ b/cmd/swarmctl/service/remove.go @@ -4,8 +4,8 @@ import ( "errors" "fmt" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/cmd/swarmctl/common" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/cmd/swarmctl/common" "github.com/spf13/cobra" ) diff --git a/cmd/swarmctl/service/update.go b/cmd/swarmctl/service/update.go index 5b72bb4c6a..1a815359ba 100644 --- a/cmd/swarmctl/service/update.go +++ b/cmd/swarmctl/service/update.go @@ -5,9 +5,9 @@ import ( "fmt" "reflect" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/cmd/swarmctl/common" - "github.com/docker/swarmkit/cmd/swarmctl/service/flagparser" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/cmd/swarmctl/common" + "github.com/moby/swarmkit/v2/cmd/swarmctl/service/flagparser" "github.com/spf13/cobra" ) diff --git a/cmd/swarmctl/task/inspect.go b/cmd/swarmctl/task/inspect.go index cc0074c130..104efe44b8 100644 --- a/cmd/swarmctl/task/inspect.go +++ b/cmd/swarmctl/task/inspect.go @@ -8,8 +8,8 @@ import ( "strings" "text/tabwriter" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/cmd/swarmctl/common" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/cmd/swarmctl/common" gogotypes "github.com/gogo/protobuf/types" "github.com/spf13/cobra" ) diff --git a/cmd/swarmctl/task/list.go b/cmd/swarmctl/task/list.go index c4be856a60..9fb2f5ddae 100644 --- a/cmd/swarmctl/task/list.go +++ b/cmd/swarmctl/task/list.go @@ -6,8 +6,8 @@ import ( "os" "text/tabwriter" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/cmd/swarmctl/common" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/cmd/swarmctl/common" "github.com/spf13/cobra" ) diff --git a/cmd/swarmctl/task/print.go b/cmd/swarmctl/task/print.go index 17d91811fe..2b4faf1464 100644 --- a/cmd/swarmctl/task/print.go +++ b/cmd/swarmctl/task/print.go @@ -6,8 +6,8 @@ import ( "sort" "text/tabwriter" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/cmd/swarmctl/common" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/cmd/swarmctl/common" gogotypes "github.com/gogo/protobuf/types" ) diff --git a/cmd/swarmctl/task/remove.go b/cmd/swarmctl/task/remove.go index f923f8823b..c1fb21a655 100644 --- a/cmd/swarmctl/task/remove.go +++ b/cmd/swarmctl/task/remove.go @@ -4,8 +4,8 @@ import ( "errors" "fmt" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/cmd/swarmctl/common" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/cmd/swarmctl/common" "github.com/spf13/cobra" ) diff --git a/cmd/swarmd/main.go b/cmd/swarmd/main.go index 89fcc573a2..392b026eb9 100644 --- a/cmd/swarmd/main.go +++ b/cmd/swarmd/main.go @@ -11,15 +11,15 @@ import ( "os/signal" engineapi "github.com/docker/docker/client" - "github.com/docker/swarmkit/agent/exec/dockerapi" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/api/genericresource" - "github.com/docker/swarmkit/cli" - "github.com/docker/swarmkit/cmd/swarmd/defaults" - "github.com/docker/swarmkit/log" - "github.com/docker/swarmkit/manager/encryption" - "github.com/docker/swarmkit/node" - "github.com/docker/swarmkit/version" + "github.com/moby/swarmkit/v2/agent/exec/dockerapi" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/api/genericresource" + "github.com/moby/swarmkit/v2/cli" + "github.com/moby/swarmkit/v2/cmd/swarmd/defaults" + "github.com/moby/swarmkit/v2/log" + "github.com/moby/swarmkit/v2/manager/encryption" + "github.com/moby/swarmkit/v2/node" + "github.com/moby/swarmkit/v2/version" grpc_prometheus "github.com/grpc-ecosystem/go-grpc-prometheus" "github.com/prometheus/client_golang/prometheus/promhttp" "github.com/sirupsen/logrus" diff --git a/connectionbroker/broker.go b/connectionbroker/broker.go index a5510a9ff0..81ea4fa3e1 100644 --- a/connectionbroker/broker.go +++ b/connectionbroker/broker.go @@ -8,8 +8,8 @@ import ( "sync" "time" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/remotes" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/remotes" grpc_prometheus "github.com/grpc-ecosystem/go-grpc-prometheus" "google.golang.org/grpc" ) diff --git a/containerized.mk b/containerized.mk index 16391fbe02..e39a729c5e 100644 --- a/containerized.mk +++ b/containerized.mk @@ -1,6 +1,6 @@ IMAGE_NAME=docker/swarmkit GOPATH=/go -DOCKER_IMAGE_DIR=${GOPATH}/src/${PROJECT_ROOT} +DOCKER_IMAGE_DIR=${GOPATH}/src/github.com/docker/swarmkit DOCKER_SWARMKIT_DELVE_PORT ?= 2345 diff --git a/direct.mk b/direct.mk index 65b2dc4cd5..b6d25cf34d 100644 --- a/direct.mk +++ b/direct.mk @@ -8,8 +8,8 @@ VERSION=$(shell git describe --match 'v[0-9]*' --dirty='.m' --always) RACE := $(shell test $$(go env GOARCH) != "amd64" || (echo "-race")) # Project packages. -PACKAGES=$(shell go list ./... | grep -v /vendor/) -INTEGRATION_PACKAGE=${PROJECT_ROOT}/integration +PACKAGES := $(shell go list ./...) +INTEGRATION_PACKAGE := $(shell go list ./integration) # Project binaries. COMMANDS=swarmd swarmctl swarm-bench swarm-rafttool protoc-gen-gogoswarm @@ -89,8 +89,6 @@ integration-tests: ## run integration tests # Build a binary from a cmd. bin/%: cmd/% .FORCE - @test $$(go list) = "${PROJECT_ROOT}" || \ - (echo "👹 Please correctly set up your Go build environment. This project must be located at /src/${PROJECT_ROOT}" && false) @echo "🐳 $@" @go build -tags "${DOCKER_BUILDTAGS}" -o $@ ${GO_LDFLAGS} ${GO_GCFLAGS} ./$< @@ -137,19 +135,15 @@ help: ## this help .PHONY: dep-validate dep-validate: go-mod-vendor @echo "+ $@" - @go mod tidy -modfile vendor.mod - @git diff --exit-code vendor.mod vendor.sum vendor || \ - (echo >&2 "+ inconsistent dependencies! what you have in vendor.mod does not match with what you have in vendor" && false) - -go.mod: - @printf "module github.com/docker/swarmkit\n\ngo 1.17\n" > $@ - + @go mod tidy + @git diff --exit-code go.mod go.sum vendor || \ + (echo >&2 "+ inconsistent dependencies! what you have in go.mod does not match with what you have in vendor" && false) .PHONY: go-mod-vendor -go-mod-vendor: go.mod - @go mod vendor -modfile vendor.mod +go-mod-vendor: + @go mod vendor @# ensure that key protobuf spec files are in vendor dir @module=github.com/gogo/protobuf ; \ prefix=$$(go env GOPATH)/pkg/mod/$${module} ; \ - version=$$(go list -modfile vendor.mod -m -f '{{.Version}}' $${module}) ; \ + version=$$(go list -m -f '{{.Version}}' $${module}) ; \ cp -a $${prefix}@$${version}/protobuf vendor/$${module}/ && chmod -R u+w vendor/$${module} diff --git a/vendor.mod b/go.mod similarity index 93% rename from vendor.mod rename to go.mod index b0c9248985..dc727452fb 100644 --- a/vendor.mod +++ b/go.mod @@ -1,9 +1,4 @@ -// 'vendor.mod' enables use of 'go mod vendor' to managed 'vendor/' directory. -// There is no 'go.mod' file, as that would imply opting in for all the rules -// around SemVer. Switch over may occur in the future, but presently the goal -// is to just use 'go mod vendor' here and other projects including moby. - -module github.com/docker/swarmkit +module github.com/moby/swarmkit/v2 go 1.17 @@ -14,7 +9,7 @@ require ( github.com/cloudflare/cfssl v0.0.0-20180323000720-5d63dbd981b5 github.com/container-storage-interface/spec v1.2.0 github.com/docker/distribution v2.7.1+incompatible - github.com/docker/docker v20.10.3-0.20220126110425-3c06ebd87668+incompatible + github.com/docker/docker v20.10.3-0.20220408103430-7ea283fd9166+incompatible // v22.04 dev github.com/docker/go-connections v0.4.0 github.com/docker/go-events v0.0.0-20190806004212-e31b211e4f1c github.com/docker/go-metrics v0.0.1 @@ -60,7 +55,6 @@ require ( github.com/cespare/xxhash/v2 v2.1.1 // indirect github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403 // indirect github.com/cncf/xds/go v0.0.0-20210805033703-aa0b78936158 // indirect - github.com/containerd/containerd v1.5.9 // indirect github.com/coreos/go-semver v0.3.0 // indirect github.com/coreos/go-systemd/v22 v22.3.2 // indirect github.com/cpuguy83/go-md2man/v2 v2.0.0 // indirect @@ -77,7 +71,7 @@ require ( github.com/google/btree v1.0.1 // indirect github.com/google/certificate-transparency-go v1.1.2 // indirect github.com/google/trillian v1.4.0 // indirect - github.com/gorilla/mux v1.8.0 // indirect + github.com/google/uuid v1.2.0 // indirect github.com/gorilla/websocket v1.4.2 // indirect github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 // indirect github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect diff --git a/vendor.sum b/go.sum similarity index 76% rename from vendor.sum rename to go.sum index 77e609b274..e93f9d1edf 100644 --- a/vendor.sum +++ b/go.sum @@ -1,4 +1,3 @@ -bazil.org/fuse v0.0.0-20160811212531-371fbbdaa898/go.mod h1:Xbm+BRKSBEpa4q4hTSxohYNQpsxXPbPry4JJWOB3LB8= bazil.org/fuse v0.0.0-20180421153158-65cc252bf669/go.mod h1:Xbm+BRKSBEpa4q4hTSxohYNQpsxXPbPry4JJWOB3LB8= bitbucket.org/creachadair/shell v0.0.6 h1:reJflDbKqnlnqb4Oo2pQ1/BqmY/eCWcNGHrIUO8qIzc= bitbucket.org/creachadair/shell v0.0.6/go.mod h1:8Qqi/cYk7vPnsOePHroKXDJYmb5x7ENhtiFtfZq8K+M= @@ -68,25 +67,13 @@ contrib.go.opencensus.io/resource v0.1.1/go.mod h1:F361eGI91LCmW1I/Saf+rX0+OFcig dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= github.com/Azure/azure-amqp-common-go/v2 v2.1.0/go.mod h1:R8rea+gJRuJR6QxTir/XuEd+YuKoUiazDC/N96FiDEU= github.com/Azure/azure-pipeline-go v0.2.1/go.mod h1:UGSo8XybXnIGZ3epmeBw7Jdz+HiUVpqIlpz/HKHylF4= -github.com/Azure/azure-sdk-for-go v16.2.1+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= github.com/Azure/azure-sdk-for-go v29.0.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= github.com/Azure/azure-sdk-for-go v30.1.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= github.com/Azure/azure-service-bus-go v0.9.1/go.mod h1:yzBx6/BUGfjfeqbRZny9AQIbIe3AcV9WZbAdpkoXOa0= github.com/Azure/azure-storage-blob-go v0.8.0/go.mod h1:lPI3aLPpuLTeUwh1sViKXFxwl2B6teiRqI0deQUvsw0= -github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod h1:LmzpDX56iTiv29bbRTIsUNlaFfuhWRQBWjQdVyAevI8= github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 h1:UQHMgLO+TxOElx5B5HZ4hJQsoJ/PvUvKRhJHDQXO8P8= github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E= -github.com/Azure/go-autorest v10.8.1+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24= github.com/Azure/go-autorest v12.0.0+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24= -github.com/Azure/go-autorest v14.2.0+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24= -github.com/Azure/go-autorest/autorest v0.11.1/go.mod h1:JFgpikqFJ/MleTTxwepExTKnFUKKszPS8UavbQYUMuw= -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.5/go.mod h1:B7KF7jKIeC9Mct5spmyCB/A8CG/sEz1vwIRGv/bbw7A= -github.com/Azure/go-autorest/autorest/date v0.3.0/go.mod h1:BI0uouVdmngYNUzGWeSYnokU+TrmwEsOqdt8Y6sso74= -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/go.mod h1:LTp+uSrOhSkaKrUy935gNZuuIPPVsHlr9DSOxSayd+k= -github.com/Azure/go-autorest/logger v0.2.0/go.mod h1:T9E3cAhj2VqvPOtCYAvby9aBXkZmbF5NWuPV8+WeEW8= -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/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= @@ -99,30 +86,9 @@ github.com/Masterminds/semver/v3 v3.0.3/go.mod h1:VPu/7SZ7ePZ3QOrcuXROw5FAcLl4a0 github.com/Masterminds/semver/v3 v3.1.0/go.mod h1:VPu/7SZ7ePZ3QOrcuXROw5FAcLl4a0cBrbBpGY/8hQs= github.com/Masterminds/sprig v2.15.0+incompatible/go.mod h1:y6hNFY5UBTIWBxnzTeuNhlNS5hqE0NB0E6fgfo2Br3o= github.com/Masterminds/sprig v2.22.0+incompatible/go.mod h1:y6hNFY5UBTIWBxnzTeuNhlNS5hqE0NB0E6fgfo2Br3o= -github.com/Microsoft/go-winio v0.4.11/go.mod h1:VhR8bwka0BXejwEJY73c50VrPtXAaKcyvVC4A4RozmA= -github.com/Microsoft/go-winio v0.4.14/go.mod h1:qXqCSQ3Xa7+6tgxaGTIe4Kpcdsi+P8jBhyzoq1bpyYA= -github.com/Microsoft/go-winio v0.4.15-0.20190919025122-fc70bd9a86b5/go.mod h1:tTuCMEN+UleMWgg9dVx4Hu52b1bJo+59jBh3ajtinzw= -github.com/Microsoft/go-winio v0.4.16-0.20201130162521-d1ffc52c7331/go.mod h1:XB6nPKklQyQ7GC9LdcBEcBl8PF76WugXOPRXwdLnMv0= -github.com/Microsoft/go-winio v0.4.16/go.mod h1:XB6nPKklQyQ7GC9LdcBEcBl8PF76WugXOPRXwdLnMv0= -github.com/Microsoft/go-winio v0.4.17-0.20210211115548-6eac466e5fa3/go.mod h1:JPGBdM1cNvN/6ISo+n8V5iA4v8pBzdOpzfwIujj1a84= -github.com/Microsoft/go-winio v0.4.17-0.20210324224401-5516f17a5958/go.mod h1:JPGBdM1cNvN/6ISo+n8V5iA4v8pBzdOpzfwIujj1a84= github.com/Microsoft/go-winio v0.4.17 h1:iT12IBVClFevaf8PuVyi3UmZOVh4OqnaLxDTW2O6j3w= github.com/Microsoft/go-winio v0.4.17/go.mod h1:JPGBdM1cNvN/6ISo+n8V5iA4v8pBzdOpzfwIujj1a84= -github.com/Microsoft/hcsshim v0.8.6/go.mod h1:Op3hHsoHPAvb6lceZHDtd9OkTew38wNoXnJs8iY7rUg= -github.com/Microsoft/hcsshim v0.8.7-0.20190325164909-8abdbb8205e4/go.mod h1:Op3hHsoHPAvb6lceZHDtd9OkTew38wNoXnJs8iY7rUg= -github.com/Microsoft/hcsshim v0.8.7/go.mod h1:OHd7sQqRFrYd3RmSgbgji+ctCwkbq2wbEYNSzOYtcBQ= -github.com/Microsoft/hcsshim v0.8.9/go.mod h1:5692vkUqntj1idxauYlpoINNKeqCiG6Sg38RRsjT5y8= -github.com/Microsoft/hcsshim v0.8.14/go.mod h1:NtVKoYxQuTLx6gEq0L96c9Ju4JbRJ4nY2ow3VK6a9Lg= -github.com/Microsoft/hcsshim v0.8.15/go.mod h1:x38A4YbHbdxJtc0sF6oIz+RG0npwSCAvn69iY6URG00= -github.com/Microsoft/hcsshim v0.8.16/go.mod h1:o5/SZqmR7x9JNKsW3pu+nqHm0MF8vbA+VxGOoXdC600= -github.com/Microsoft/hcsshim v0.8.23/go.mod h1:4zegtUJth7lAvFyc6cH2gGQ5B3OFQim01nnU2M8jKDg= -github.com/Microsoft/hcsshim/test v0.0.0-20201218223536-d3e5debf77da/go.mod h1:5hlzMzRKMLyo42nCZ9oml8AdTlq/0cvIaBv6tK1RehU= -github.com/Microsoft/hcsshim/test v0.0.0-20210227013316-43a75bb4edd3/go.mod h1:mw7qgWloBUl75W/gVH3cQszUg1+gUITj7D6NY7ywVnY= -github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod h1:3wb06e3pkSAbeQ52E9H9iFoQsEEwGN64994WTCIhntQ= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= -github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0= -github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE= -github.com/Shopify/logrus-bugsnag v0.0.0-20171204204709-577dee27f20d/go.mod h1:HI8ITrYtUY+O+ZhtlqUnD8+KwNPOyugEhfP9fdUIaEQ= github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo= github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI= github.com/VividCortex/gohistogram v1.0.0/go.mod h1:Pf5mBqqDxYaXu3hDrrU+w6nw50o/4+TcAqDqk/vUH7g= @@ -138,7 +104,6 @@ github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuy github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho= -github.com/alexflint/go-filemutex v0.0.0-20171022225611-72bdc8eae2ae/go.mod h1:CgnQgUtFrFz9mxFNtED3jI5tLDjKlOM+oUF/sTk6ps0= github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod h1:2FmKhYUyUczH0OGQWaF5ceTx0UBShxjsH6f8oGKYe2c= github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= github.com/aokoli/goutils v1.0.1/go.mod h1:SijmP0QR8LtwsmDs8Yii5Z/S4trXFGFC2oO5g9DP+DQ= @@ -156,9 +121,7 @@ github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmV github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs= github.com/aryann/difflib v0.0.0-20170710044230-e206f873d14a/go.mod h1:DAHtR1m6lCRdSC2Tm3DSWRPvIPr6xNKyeHdqDQSQT+A= -github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY= github.com/aws/aws-lambda-go v1.13.3/go.mod h1:4UKl9IzQMoD+QF79YdCuzCwp8VbmG4VAQwij/eHl5CU= -github.com/aws/aws-sdk-go v1.15.11/go.mod h1:mFuSZ37Z9YOHbQEwBWztmVzqXrEkub65tZoCYDt7FT0= github.com/aws/aws-sdk-go v1.15.27/go.mod h1:mFuSZ37Z9YOHbQEwBWztmVzqXrEkub65tZoCYDt7FT0= github.com/aws/aws-sdk-go v1.19.18/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= github.com/aws/aws-sdk-go v1.19.45/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= @@ -171,33 +134,21 @@ github.com/aws/aws-sdk-go-v2 v0.18.0/go.mod h1:JWVYvqSMppoMJC0x5wdwiImzgXTI9FuZw github.com/aybabtme/rgbterm v0.0.0-20170906152045-cc83f3b3ce59/go.mod h1:q/89r3U2H7sSsE2t6Kca0lfwTK8JdoNGS/yzM/4iH5I= github.com/benbjohnson/clock v1.0.3 h1:vkLuvpK4fmtSCuo60+yC63p7y0BmQ8gm5ZXGuBCJyXg= github.com/benbjohnson/clock v1.0.3/go.mod h1:bGMdMPoPVvcYyt1gHDf4J2KE153Yf9BuiUKYMaxlTDM= -github.com/beorn7/perks v0.0.0-20160804104726-4c0e84591b9a/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= 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/bgentry/speakeasy v0.1.0 h1:ByYyxL9InA1OWqxJqqp2A5pYHUrCiAL6K3J+LKSsQkY= github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= -github.com/bitly/go-simplejson v0.5.0/go.mod h1:cXHtHw4XUPsvGaxgjIAn8PhEWG9NfngEKAMDJEczWVA= -github.com/bits-and-blooms/bitset v1.2.0/go.mod h1:gIdJ4wp64HaoK2YrL1Q5/N7Y16edYb8uY+O0FJTyyDA= github.com/bketelsen/crypt v0.0.3-0.20200106085610-5cbc8cc4026c/go.mod h1:MKsuJmJgSg28kpZDP6UIiPt0e0Oz0kqKNGyRaWEPv84= github.com/blakesmith/ar v0.0.0-20190502131153-809d4375e1fb/go.mod h1:PkYb9DJNAwrSvRx5DYA+gUcOIgTGVMNkfSCbZM8cWpI= -github.com/blang/semver v3.1.0+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk= -github.com/blang/semver v3.5.1+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk= -github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869/go.mod h1:Ekp36dRnpXw/yCqJaO+ZrUyxD+3VXMFFr56k5XYrpB4= github.com/boltdb/bolt v1.3.1 h1:JQmyP4ZBrce+ZQu0dY660FMfatumYDLun9hBCUVIkF4= github.com/boltdb/bolt v1.3.1/go.mod h1:clJnj/oiGkjum5o1McbSZDSLxVThjynRyGBgiAx27Ps= -github.com/bshuster-repo/logrus-logstash-hook v0.4.1/go.mod h1:zsTqEiSzDgAa/8GZR7E1qaXrhYNDKBYy5/dWPTIflbk= -github.com/buger/jsonparser v0.0.0-20180808090653-f4dd9f5a6b44/go.mod h1:bbYlZJ7hK1yFx9hf58LP0zeX7UjIGs20ufpu3evjr+s= -github.com/bugsnag/bugsnag-go v0.0.0-20141110184014-b1d153021fcd/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/caarlos0/ctrlc v1.0.0/go.mod h1:CdXpj4rmq0q/1Eb44M9zi2nKB0QraNKuRGYGrrHhcQw= github.com/campoy/unique v0.0.0-20180121183637-88950e537e7e/go.mod h1:9IOqJGCPMSc6E5ydlp5NIonxObaeu/Iub/X03EKPVYo= github.com/casbin/casbin/v2 v2.1.2/go.mod h1:YcPU1XXisHhLzuxH9coDNf2FbKpjGlbCg3n9yuLkIJQ= github.com/cavaliercoder/go-cpio v0.0.0-20180626203310-925f9528c45e/go.mod h1:oDpT4efm8tSYHXV5tHSdRvBet/b/QzxZ+XyyPehvm3A= github.com/cenkalti/backoff v2.2.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM= -github.com/cenkalti/backoff/v4 v4.1.1/go.mod h1:scbssz8iZGpm3xbr14ovlUdkxfGXNInqkPWOWmG2CLw= github.com/census-instrumentation/opencensus-proto v0.2.0/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/census-instrumentation/opencensus-proto v0.3.0 h1:t/LhUZLVitR1Ow2YOnduCsavhwFUklBMoGVYUCqmCqk= @@ -209,16 +160,9 @@ github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko= github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= github.com/cespare/xxhash/v2 v2.1.1 h1:6MnRN8NT7+YBpUIWxHtefFZOKTAPgGjpQSxqLNn0+qY= github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= -github.com/checkpoint-restore/go-criu/v4 v4.1.0/go.mod h1:xUQBLp4RLc5zJtWY++yjOoMoB5lihDt7fai+75m+rGw= -github.com/checkpoint-restore/go-criu/v5 v5.0.0/go.mod h1:cfwC0EG7HMUenopBsUf9d89JlCLQIfgVcNsNN0t6T2M= github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= -github.com/cilium/ebpf v0.0.0-20200110133405-4032b1d8aae3/go.mod h1:MA5e5Lr8slmEg9bt0VpxxWqJlO4iwu3FBdHUzV7wQVg= -github.com/cilium/ebpf v0.0.0-20200702112145-1c8d4c9ef775/go.mod h1:7cR51M8ViRLIdUjrmSXlK9pkrsDlLHbO8jiB8X8JnOc= -github.com/cilium/ebpf v0.2.0/go.mod h1:To2CFviqOWL/M0gIMsvSMlqe7em/l1ALkX1PyjrX2Qs= -github.com/cilium/ebpf v0.4.0/go.mod h1:4tRaxcgiL706VnOzHOdBlY8IEAIdxINsQBcU4xJJXRs= -github.com/cilium/ebpf v0.6.2/go.mod h1:4tRaxcgiL706VnOzHOdBlY8IEAIdxINsQBcU4xJJXRs= github.com/clbanning/x2j v0.0.0-20191024224557-825249438eec/go.mod h1:jMjuTZXRI4dUb/I5gc9Hdhagfvm9+RyrPryS/auMzxE= github.com/cloudflare/cfssl v0.0.0-20180323000720-5d63dbd981b5 h1:PqZ3bA4yzwywivzk7PBQWngJp2/PAS0bWRZerKteicY= github.com/cloudflare/cfssl v0.0.0-20180323000720-5d63dbd981b5/go.mod h1:yMWuSON2oQp+43nFtAV/uvKQIFpSPerB57DCt9t8sSA= @@ -236,105 +180,16 @@ github.com/cockroachdb/logtags v0.0.0-20190617123548-eb05cc24525f/go.mod h1:i/u9 github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE/e/2PUdi/liOCUjSTXgM1o87ZssimdTWN964YiIeI= github.com/container-storage-interface/spec v1.2.0 h1:bD9KIVgaVKKkQ/UbVUY9kCaH/CJbhNxe0eeB4JeJV2s= github.com/container-storage-interface/spec v1.2.0/go.mod h1:6URME8mwIBbpVyZV93Ce5St17xBiQJQY67NDsuohiy4= -github.com/containerd/aufs v0.0.0-20200908144142-dab0cbea06f4/go.mod h1:nukgQABAEopAHvB6j7cnP5zJ+/3aVcE7hCYqvIwAHyE= -github.com/containerd/aufs v0.0.0-20201003224125-76a6863f2989/go.mod h1:AkGGQs9NM2vtYHaUen+NljV0/baGCAPELGm2q9ZXpWU= -github.com/containerd/aufs v0.0.0-20210316121734-20793ff83c97/go.mod h1:kL5kd6KM5TzQjR79jljyi4olc1Vrx6XBlcyj3gNv2PU= -github.com/containerd/aufs v1.0.0/go.mod h1:kL5kd6KM5TzQjR79jljyi4olc1Vrx6XBlcyj3gNv2PU= -github.com/containerd/btrfs v0.0.0-20201111183144-404b9149801e/go.mod h1:jg2QkJcsabfHugurUvvPhS3E08Oxiuh5W/g1ybB4e0E= -github.com/containerd/btrfs v0.0.0-20210316141732-918d888fb676/go.mod h1:zMcX3qkXTAi9GI50+0HOeuV8LU2ryCE/V2vG/ZBiTss= -github.com/containerd/btrfs v1.0.0/go.mod h1:zMcX3qkXTAi9GI50+0HOeuV8LU2ryCE/V2vG/ZBiTss= -github.com/containerd/cgroups v0.0.0-20190717030353-c4b9ac5c7601/go.mod h1:X9rLEHIqSf/wfK8NsPqxJmeZgW4pcfzdXITDrUSJ6uI= -github.com/containerd/cgroups v0.0.0-20190919134610-bf292b21730f/go.mod h1:OApqhQ4XNSNC13gXIwDjhOQxjWa/NxkwZXJ1EvqT0ko= -github.com/containerd/cgroups v0.0.0-20200531161412-0dbf7f05ba59/go.mod h1:pA0z1pT8KYB3TCXK/ocprsh7MAkoW8bZVzPdih9snmM= -github.com/containerd/cgroups v0.0.0-20200710171044-318312a37340/go.mod h1:s5q4SojHctfxANBDvMeIaIovkq29IP48TKAxnhYRxvo= -github.com/containerd/cgroups v0.0.0-20200824123100-0b889c03f102/go.mod h1:s5q4SojHctfxANBDvMeIaIovkq29IP48TKAxnhYRxvo= -github.com/containerd/cgroups v0.0.0-20210114181951-8a68de567b68/go.mod h1:ZJeTFisyysqgcCdecO57Dj79RfL0LNeGiFUqLYQRYLE= -github.com/containerd/cgroups v1.0.1/go.mod h1:0SJrPIenamHDcZhEcJMNBB85rHcUsw4f25ZfBiPYRkU= -github.com/containerd/console v0.0.0-20180822173158-c12b1e7919c1/go.mod h1:Tj/on1eG8kiEhd0+fhSDzsPAFESxzBBvdyEgyryXffw= -github.com/containerd/console v0.0.0-20181022165439-0650fd9eeb50/go.mod h1:Tj/on1eG8kiEhd0+fhSDzsPAFESxzBBvdyEgyryXffw= -github.com/containerd/console v0.0.0-20191206165004-02ecf6a7291e/go.mod h1:8Pf4gM6VEbTNRIT26AyyU7hxdQU3MvAvxVI0sc00XBE= -github.com/containerd/console v1.0.1/go.mod h1:XUsP6YE/mKtz6bxc+I8UiKKTP04qjQL4qcS3XoQ5xkw= -github.com/containerd/console v1.0.2/go.mod h1:ytZPjGgY2oeTkAONYafi2kSj0aYggsf8acV1PGKCbzQ= -github.com/containerd/containerd v1.2.10/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA= -github.com/containerd/containerd v1.3.0-beta.2.0.20190828155532-0293cbd26c69/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA= -github.com/containerd/containerd v1.3.0/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA= -github.com/containerd/containerd v1.3.1-0.20191213020239-082f7e3aed57/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA= -github.com/containerd/containerd v1.3.2/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA= -github.com/containerd/containerd v1.4.0-beta.2.0.20200729163537-40b22ef07410/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA= -github.com/containerd/containerd v1.4.1/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA= -github.com/containerd/containerd v1.4.3/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA= -github.com/containerd/containerd v1.4.9/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA= -github.com/containerd/containerd v1.5.0-beta.1/go.mod h1:5HfvG1V2FsKesEGQ17k5/T7V960Tmcumvqn8Mc+pCYQ= -github.com/containerd/containerd v1.5.0-beta.3/go.mod h1:/wr9AVtEM7x9c+n0+stptlo/uBBoBORwEx6ardVcmKU= -github.com/containerd/containerd v1.5.0-beta.4/go.mod h1:GmdgZd2zA2GYIBZ0w09ZvgqEq8EfBp/m3lcVZIvPHhI= -github.com/containerd/containerd v1.5.0-rc.0/go.mod h1:V/IXoMqNGgBlabz3tHD2TWDoTJseu1FGOKuoA4nNb2s= -github.com/containerd/containerd v1.5.9 h1:rs6Xg1gtIxaeyG+Smsb/0xaSDu1VgFhOCKBXxMxbsF4= -github.com/containerd/containerd v1.5.9/go.mod h1:fvQqCfadDGga5HZyn3j4+dx56qj2I9YwBrlSdalvJYQ= -github.com/containerd/continuity v0.0.0-20190426062206-aaeac12a7ffc/go.mod h1:GL3xCUCBDV3CZiTSEKksMWbLE66hEyuu9qyDOOqM47Y= -github.com/containerd/continuity v0.0.0-20190815185530-f2a389ac0a02/go.mod h1:GL3xCUCBDV3CZiTSEKksMWbLE66hEyuu9qyDOOqM47Y= -github.com/containerd/continuity v0.0.0-20191127005431-f65d91d395eb/go.mod h1:GL3xCUCBDV3CZiTSEKksMWbLE66hEyuu9qyDOOqM47Y= -github.com/containerd/continuity v0.0.0-20200710164510-efbc4488d8fe/go.mod h1:cECdGN1O8G9bgKTlLhuPJimka6Xb/Gg7vYzCTNVxhvo= -github.com/containerd/continuity v0.0.0-20201208142359-180525291bb7/go.mod h1:kR3BEg7bDFaEddKm54WSmrol1fKWDU1nKYkgrcgZT7Y= -github.com/containerd/continuity v0.0.0-20210208174643-50096c924a4e/go.mod h1:EXlVlkqNba9rJe3j7w3Xa924itAMLgZH4UD/Q4PExuQ= -github.com/containerd/continuity v0.1.0/go.mod h1:ICJu0PwR54nI0yPEnJ6jcS+J7CZAUXrLh8lPo2knzsM= -github.com/containerd/fifo v0.0.0-20180307165137-3d5202aec260/go.mod h1:ODA38xgv3Kuk8dQz2ZQXpnv/UZZUHUCL7pnLehbXgQI= -github.com/containerd/fifo v0.0.0-20190226154929-a9fb20d87448/go.mod h1:ODA38xgv3Kuk8dQz2ZQXpnv/UZZUHUCL7pnLehbXgQI= -github.com/containerd/fifo v0.0.0-20200410184934-f15a3290365b/go.mod h1:jPQ2IAeZRCYxpS/Cm1495vGFww6ecHmMk1YJH2Q5ln0= -github.com/containerd/fifo v0.0.0-20201026212402-0724c46b320c/go.mod h1:jPQ2IAeZRCYxpS/Cm1495vGFww6ecHmMk1YJH2Q5ln0= -github.com/containerd/fifo v0.0.0-20210316144830-115abcc95a1d/go.mod h1:ocF/ME1SX5b1AOlWi9r677YJmCPSwwWnQ9O123vzpE4= -github.com/containerd/fifo v1.0.0/go.mod h1:ocF/ME1SX5b1AOlWi9r677YJmCPSwwWnQ9O123vzpE4= -github.com/containerd/go-cni v1.0.1/go.mod h1:+vUpYxKvAF72G9i1WoDOiPGRtQpqsNW/ZHtSlv++smU= -github.com/containerd/go-cni v1.0.2/go.mod h1:nrNABBHzu0ZwCug9Ije8hL2xBCYh/pjfMb1aZGrrohk= -github.com/containerd/go-runc v0.0.0-20180907222934-5a6d9f37cfa3/go.mod h1:IV7qH3hrUgRmyYrtgEeGWJfWbgcHL9CSRruz2Vqcph0= -github.com/containerd/go-runc v0.0.0-20190911050354-e029b79d8cda/go.mod h1:IV7qH3hrUgRmyYrtgEeGWJfWbgcHL9CSRruz2Vqcph0= -github.com/containerd/go-runc v0.0.0-20200220073739-7016d3ce2328/go.mod h1:PpyHrqVs8FTi9vpyHwPwiNEGaACDxT/N/pLcvMSRA9g= -github.com/containerd/go-runc v0.0.0-20201020171139-16b287bc67d0/go.mod h1:cNU0ZbCgCQVZK4lgG3P+9tn9/PaJNmoDXPpoJhDR+Ok= -github.com/containerd/go-runc v1.0.0/go.mod h1:cNU0ZbCgCQVZK4lgG3P+9tn9/PaJNmoDXPpoJhDR+Ok= -github.com/containerd/imgcrypt v1.0.1/go.mod h1:mdd8cEPW7TPgNG4FpuP3sGBiQ7Yi/zak9TYCG3juvb0= -github.com/containerd/imgcrypt v1.0.4-0.20210301171431-0ae5c75f59ba/go.mod h1:6TNsg0ctmizkrOgXRNQjAPFWpMYRWuiB6dSF4Pfa5SA= -github.com/containerd/imgcrypt v1.1.1-0.20210312161619-7ed62a527887/go.mod h1:5AZJNI6sLHJljKuI9IHnw1pWqo/F0nGDOuR9zgTs7ow= -github.com/containerd/imgcrypt v1.1.1/go.mod h1:xpLnwiQmEUJPvQoAapeb2SNCxz7Xr6PJrXQb0Dpc4ms= -github.com/containerd/nri v0.0.0-20201007170849-eb1350a75164/go.mod h1:+2wGSDGFYfE5+So4M5syatU0N0f0LbWpuqyMi4/BE8c= -github.com/containerd/nri v0.0.0-20210316161719-dbaa18c31c14/go.mod h1:lmxnXF6oMkbqs39FiCt1s0R2HSMhcLel9vNL3m4AaeY= -github.com/containerd/nri v0.1.0/go.mod h1:lmxnXF6oMkbqs39FiCt1s0R2HSMhcLel9vNL3m4AaeY= -github.com/containerd/ttrpc v0.0.0-20190828154514-0e0f228740de/go.mod h1:PvCDdDGpgqzQIzDW1TphrGLssLDZp2GuS+X5DkEJB8o= -github.com/containerd/ttrpc v0.0.0-20190828172938-92c8520ef9f8/go.mod h1:PvCDdDGpgqzQIzDW1TphrGLssLDZp2GuS+X5DkEJB8o= -github.com/containerd/ttrpc v0.0.0-20191028202541-4f1b8fe65a5c/go.mod h1:LPm1u0xBw8r8NOKoOdNMeVHSawSsltak+Ihv+etqsE8= -github.com/containerd/ttrpc v1.0.1/go.mod h1:UAxOpgT9ziI0gJrmKvgcZivgxOp8iFPSk8httJEt98Y= -github.com/containerd/ttrpc v1.0.2/go.mod h1:UAxOpgT9ziI0gJrmKvgcZivgxOp8iFPSk8httJEt98Y= -github.com/containerd/ttrpc v1.1.0/go.mod h1:XX4ZTnoOId4HklF4edwc4DcqskFZuvXB1Evzy5KFQpQ= -github.com/containerd/typeurl v0.0.0-20180627222232-a93fcdb778cd/go.mod h1:Cm3kwCdlkCfMSHURc+r6fwoGH6/F1hH3S4sg0rLFWPc= -github.com/containerd/typeurl v0.0.0-20190911142611-5eb25027c9fd/go.mod h1:GeKYzf2pQcqv7tJ0AoCuuhtnqhva5LNU3U+OyKxxJpk= -github.com/containerd/typeurl v1.0.1/go.mod h1:TB1hUtrpaiO88KEK56ijojHS1+NeF0izUACaJW2mdXg= -github.com/containerd/typeurl v1.0.2/go.mod h1:9trJWW2sRlGub4wZJRTW83VtbOLS6hwcDZXTn6oPz9s= -github.com/containerd/zfs v0.0.0-20200918131355-0a33824f23a2/go.mod h1:8IgZOBdv8fAgXddBT4dBXJPtxyRsejFIpXoklgxgEjw= -github.com/containerd/zfs v0.0.0-20210301145711-11e8f1707f62/go.mod h1:A9zfAbMlQwE+/is6hi0Xw8ktpL+6glmqZYtevJgaB8Y= -github.com/containerd/zfs v0.0.0-20210315114300-dde8f0fda960/go.mod h1:m+m51S1DvAP6r3FcmYCp54bQ34pyOwTieQDNRIRHsFY= -github.com/containerd/zfs v0.0.0-20210324211415-d5c4544f0433/go.mod h1:m+m51S1DvAP6r3FcmYCp54bQ34pyOwTieQDNRIRHsFY= -github.com/containerd/zfs v1.0.0/go.mod h1:m+m51S1DvAP6r3FcmYCp54bQ34pyOwTieQDNRIRHsFY= -github.com/containernetworking/cni v0.7.1/go.mod h1:LGwApLUm2FpoOfxTDEeq8T9ipbpZ61X79hmU3w8FmsY= -github.com/containernetworking/cni v0.8.0/go.mod h1:LGwApLUm2FpoOfxTDEeq8T9ipbpZ61X79hmU3w8FmsY= -github.com/containernetworking/cni v0.8.1/go.mod h1:LGwApLUm2FpoOfxTDEeq8T9ipbpZ61X79hmU3w8FmsY= -github.com/containernetworking/plugins v0.8.6/go.mod h1:qnw5mN19D8fIwkqW7oHHYDHVlzhJpcY6TQxn/fUyDDM= -github.com/containernetworking/plugins v0.9.1/go.mod h1:xP/idU2ldlzN6m4p5LmGiwRDjeJr6FLK6vuiUwoH7P8= -github.com/containers/ocicrypt v1.0.1/go.mod h1:MeJDzk1RJHv89LjsH0Sp5KTY3ZYkjXO/C+bKAeWFIrc= -github.com/containers/ocicrypt v1.1.0/go.mod h1:b8AOe0YR67uU8OqfVNcznfFpAzu3rdgUV4GP9qXPfu4= -github.com/containers/ocicrypt v1.1.1/go.mod h1:Dm55fwWm1YZAjYRaJ94z2mfZikIyIN4B0oB3dj3jFxY= 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/etcd v3.3.13+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk= -github.com/coreos/go-iptables v0.4.5/go.mod h1:/mVI274lEDI2ns62jHCDnCyBF9Iwsmekav8Dbxlm1MU= -github.com/coreos/go-iptables v0.5.0/go.mod h1:/mVI274lEDI2ns62jHCDnCyBF9Iwsmekav8Dbxlm1MU= -github.com/coreos/go-oidc v2.1.0+incompatible/go.mod h1:CgnwVTmzoESiwO9qyAFEMiHoZ1nMCKZlZ9V6mm3/LKc= github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= github.com/coreos/go-semver v0.3.0 h1:wkHLiw0WNATZnSG7epLsujiMCgPAc9xhjJ4tgnAxmfM= github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= -github.com/coreos/go-systemd v0.0.0-20161114122254-48702e0da86b/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= 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/go-systemd/v22 v22.0.0/go.mod h1:xO0FLkIi5MaZafQlIrOotqXZ90ih+1atmu1JpKERPPk= github.com/coreos/go-systemd/v22 v22.1.0/go.mod h1:xO0FLkIi5MaZafQlIrOotqXZ90ih+1atmu1JpKERPPk= github.com/coreos/go-systemd/v22 v22.3.2 h1:D9/bQk5vlXQFZ6Kwuu6zaiXJ9oTPe68++AzAJc1DzSI= github.com/coreos/go-systemd/v22 v22.3.2/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= @@ -348,43 +203,28 @@ github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsr github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/creack/pty v1.1.11/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= -github.com/cyphar/filepath-securejoin v0.2.2/go.mod h1:FpkQEhXnPnOthhzymB7CGsFk2G9VLXONKD9G7QGMM+4= -github.com/d2g/dhcp4 v0.0.0-20170904100407-a1d1b6c41b1c/go.mod h1:Ct2BUK8SB0YC1SMSibvLzxjeJLnrYEVLULFNiHY9YfQ= -github.com/d2g/dhcp4client v1.0.0/go.mod h1:j0hNfjhrt2SxUOw55nL0ATM/z4Yt3t2Kd1mW34z5W5s= -github.com/d2g/dhcp4server v0.0.0-20181031114812-7d4a0a7f59a5/go.mod h1:Eo87+Kg/IX2hfWJfwxMzLyuSZyxSoAug2nGa1G2QAi8= -github.com/d2g/hardwareaddr v0.0.0-20190221164911-e7d9fbe030e4/go.mod h1:bMl4RjIciD2oAxI7DmWRx6gbeqrkoLqv3MV0vzNad+I= github.com/davecgh/go-spew v0.0.0-20161028175848-04cdfd42973b/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= 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/denverdino/aliyungo v0.0.0-20190125010748-a747050bb1ba/go.mod h1:dV8lFg6daOBZbT6/BDGIz6Y3WFGn8juu6G+CQ6LHtl0= github.com/devigned/tab v0.1.1/go.mod h1:XG9mPq0dFghrYvoBF3xdRrJzSTX1b7IQrvaL9mzjeJY= -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/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no= 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/distribution v0.0.0-20190905152932-14b96e55d84c/go.mod h1:0+TTO4EOBfRPhZXAeF1Vu+W3hHZ8eLp8PgKVZlcvtFY= -github.com/docker/distribution v2.7.1-0.20190205005809-0d3efadf0154+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= 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 v20.10.3-0.20220126110425-3c06ebd87668+incompatible h1:OJoRtvDZ0H33N8k/KesnHTMeJI/Sm6dBb1T8um38MJY= -github.com/docker/docker v20.10.3-0.20220126110425-3c06ebd87668+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= +github.com/docker/docker v20.10.3-0.20220408103430-7ea283fd9166+incompatible h1:N0sFxpj9ODNzuz2LR2D/OMpmmYg3H4JeaEFekWGB2ns= +github.com/docker/docker v20.10.3-0.20220408103430-7ea283fd9166+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= 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-20170721190031-9461782956ad/go.mod h1:Uw6UezgYA44ePAFQYUehOuCzmy5zmg/+nl2ZfMWGkpA= github.com/docker/go-events v0.0.0-20190806004212-e31b211e4f1c h1:+pKlWGMw7gf6bQ+oDZB4KHQFypsfjYlq/C4rfL7D3g8= github.com/docker/go-events v0.0.0-20190806004212-e31b211e4f1c/go.mod h1:Uw6UezgYA44ePAFQYUehOuCzmy5zmg/+nl2ZfMWGkpA= -github.com/docker/go-metrics v0.0.0-20180209012529-399ea8c73916/go.mod h1:/u0gXw0Gay3ceNrsHubL3BtdOL2fHf93USgMTe0W5dI= 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/libkv v0.2.1 h1:PNXYaftMVCFS5CmnDtDWTg3wbBO61Q/cEo3KX1oKxto= github.com/docker/libkv v0.2.1/go.mod h1:r5hEwHwW8dr0TFBYGCarMNbrQOiwL1xoqDYZ/JqoTK0= -github.com/docker/libtrust v0.0.0-20150114040149-fa567046d9b1/go.mod h1:cyGadeNEkKy96OOhEzfZl+yxihPEzKnqJwvfuSUqbZE= -github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96/go.mod h1:Qh8CwZgvJUkLughtfhJv5dyTYa91l1fOUCrgjqmcifM= -github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod h1:WwZ+bS3ebgob9U8Nd0kOddGdZWjyMGR8Wziv+TBNwSE= github.com/dperny/gocsi v1.2.3-pre h1:GRTvl8G6yEXYPyul1h6YAqtyxzUHTrQHo6G3xZpb9oM= github.com/dperny/gocsi v1.2.3-pre/go.mod h1:qQw5mIunz1RqMUfZcGJ9/Lt9EDaL0N3wPNYxFTuyLQo= github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= @@ -394,9 +234,6 @@ github.com/eapache/go-resiliency v1.1.0/go.mod h1:kFI+JgMyC7bLPUVY133qvEBtVayf5m github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod h1:+020luEh2TKB4/GOp8oxxtq0Daoen/Cii55CzbTV6DU= github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFPTqq+I= github.com/edsrzf/mmap-go v1.0.0/go.mod h1:YO35OhQPt3KJa3ryjFM5Bs14WD66h8eGKpfaBNrHW5M= -github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153/go.mod h1:/Zj4wYkgs4iZTTu3o/KG3Itv/qCCa8VVMlb3i9OVuzc= -github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs= -github.com/emicklei/go-restful v2.9.5+incompatible/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs= github.com/emirpasic/gods v1.12.0/go.mod h1:YfzfFFoVP/catgzJb4IKIqXjX78Ha8FMSDh3ymbK86o= github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021 h1:fP+fF0up6oPY49OrjPrhIJ8yQfdIM85NXMLkMg1EXVs= github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go.mod h1:AFq3mo9L8Lqqiid3OhADV3RfLJnjiw63cSpi+fDTRC0= @@ -404,7 +241,6 @@ github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7 github.com/envoyproxy/protoc-gen-validate v0.3.0-java h1:bV5JGEB1ouEzZa0hgVDFFiClrUEuGWRaAc/3mxR2QK0= github.com/envoyproxy/protoc-gen-validate v0.3.0-java/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/etcd-io/gofail v0.0.0-20190801230047-ad7f989257ca/go.mod h1:49H/RkXP8pKaZy4h0d+NW16rSLhyVBt4o6VLJbmOqDE= -github.com/evanphx/json-patch v4.9.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= github.com/fatih/color v1.9.0 h1:8xPHl4/q1VyqGIPif1F+1V3Y3lSmrq01EabUW3CoW5s= github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU= @@ -418,19 +254,15 @@ github.com/fortytw2/leaktest v1.2.0/go.mod h1:jDsjWgpAGjm2CA7WthBh/CdZYEPF31XHqu github.com/fortytw2/leaktest v1.3.0/go.mod h1:jDsjWgpAGjm2CA7WthBh/CdZYEPF31XHquHwclZch5g= github.com/franela/goblin v0.0.0-20200105215937-c9ffbefa60db/go.mod h1:7dvUGVsVBjqR7JHJk0brhHOZYGmfBYOrK0ZhYMEtBr4= github.com/franela/goreq v0.0.0-20171204163338-bcd34c9993f8/go.mod h1:ZhphrRTfi2rbfLwlschooIH4+wKKDR4Pdxhh+TRoA20= -github.com/frankban/quicktest v1.11.3/go.mod h1:wRf/ReqHper53s+kmmSZizM8NamnL3IM0I9ntUbOk+k= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4= github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= -github.com/fullsailor/pkcs7 v0.0.0-20190404230743-d7302db945fa/go.mod h1:KnogPXtdwXqoenmZCw6S+25EAm2MkxbG0deNDu4cbSA= github.com/fullstorydev/grpcurl v1.8.0/go.mod h1:Mn2jWbdMrQGJQ8UD62uNyMumT2acsZUCkZIqFxsQf1o= github.com/fullstorydev/grpcurl v1.8.1/go.mod h1:3BWhvHZwNO7iLXaQlojdg5NA6SxUDePli4ecpK1N7gw= github.com/fullstorydev/grpcurl v1.8.2 h1:2II5e++aFnctnPJir3GL6cPSwF69Ord1u/9O+fv1vrI= github.com/fullstorydev/grpcurl v1.8.2/go.mod h1:YvWNT3xRp2KIRuvCphFodG0fKkMXwaxA9CJgKCcyzUQ= -github.com/garyburd/redigo v0.0.0-20150301180006-535138d7bcd7/go.mod h1:NR3MbYisc3/PwhQ00EMzDiPmrwpPxAn5GI05/YaO1SY= github.com/getsentry/raven-go v0.2.0 h1:no+xWJRb5ZI7eE8TWgIq1jLulQiIoLG0IfYxv5JYMGs= github.com/getsentry/raven-go v0.2.0/go.mod h1:KungGk8q33+aIAZUIVWZDr2OfAEBsO49PX4NzFV5kcQ= -github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI= github.com/gin-gonic/gin v1.5.0/go.mod h1:Nd6IXA8m5kNZdNEHMBd93KT+mdY3+bewLgRvmCsR2Do= @@ -446,15 +278,6 @@ github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vb 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-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A= -github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7sIas= -github.com/go-logr/logr v0.2.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU= -github.com/go-openapi/jsonpointer v0.19.2/go.mod h1:3akKfEdA7DF1sugOqz1dVQHBcuDBPKZGEoHC/NkiQRg= -github.com/go-openapi/jsonpointer v0.19.3/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg= -github.com/go-openapi/jsonreference v0.19.2/go.mod h1:jMjeRr2HHw6nAVajTXJ4eiUwohSTlpa0o73RUL1owJc= -github.com/go-openapi/jsonreference v0.19.3/go.mod h1:rjx6GuL8TTa9VaixXglHmQmIL98+wF9xc8zWvFonSJ8= -github.com/go-openapi/spec v0.19.3/go.mod h1:FpwSN1ksY1eteniUU7X0N/BgJ7a4WvBFVA8Lj9mJglo= -github.com/go-openapi/swag v0.19.2/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk= -github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk= github.com/go-playground/locales v0.12.1/go.mod h1:IUMDtCfWo/w/mtMfIE/IG2K+Ey3ygWanZIBtBW0W2TM= github.com/go-playground/universal-translator v0.16.0/go.mod h1:1AnU7NaIRDWWzGEKwgtJRd2xk99HeFyHw3yid4rvQIY= github.com/go-redis/redis v6.15.9+incompatible/go.mod h1:NAIEuMOZ/fxfXJIrKDQDz8wamY7mA7PouImQ2Jvg6kA= @@ -463,17 +286,11 @@ github.com/go-sql-driver/mysql v1.4.1/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG github.com/go-sql-driver/mysql v1.6.0 h1:BCTh4TKNUYmOmMUcQ3IipzF5prigylS7XXjEkfCHuOE= github.com/go-sql-driver/mysql v1.6.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-20151105175453-c7fdd8b5cd55/go.mod h1:/YcGZj5zSblfDWMMoOzV4fas9FZnQYTkDnsGvmh2Grw= -github.com/godbus/dbus v0.0.0-20180201030542-885f9cc04c9c/go.mod h1:/YcGZj5zSblfDWMMoOzV4fas9FZnQYTkDnsGvmh2Grw= -github.com/godbus/dbus v0.0.0-20190422162347-ade71ed3457e/go.mod h1:bBOAhwG1umN6/6ZUMtDFBMQR8jRg9O75tm9K00oMsK4= github.com/godbus/dbus/v5 v5.0.3/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= -github.com/gogo/googleapis v1.2.0/go.mod h1:Njal3psf3qN6dwBtQfUmBZh2ybovJ0tlu3o/AC7HYjU= -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.0/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4= -github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o= github.com/gogo/protobuf v1.3.0/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o= github.com/gogo/protobuf v1.3.1/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o= github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= @@ -528,7 +345,6 @@ github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO github.com/google/go-replayers/grpcreplay v0.1.0/go.mod h1:8Ig2Idjpr6gifRd6pNVggX6TC1Zw6Jx74AKp7QNH2QE= github.com/google/go-replayers/httpreplay v0.1.0/go.mod h1:YKZViNhiGgqdBlUbI2MwGpq4pXxNmhJLPHQ7cv2b5no= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= -github.com/google/gofuzz v1.1.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/licenseclassifier v0.0.0-20210325184830-bb04aff29e72/go.mod h1:qsqn2hxC+vURpyBRygGUuinTO42MFRLcsmQ/P8v94+M= github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= github.com/google/martian v2.1.1-0.20190517191504-25dcb96d9e51+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= @@ -567,23 +383,17 @@ github.com/google/wire v0.3.0/go.mod h1:i1DMg/Lu8Sz5yYl25iOdmc5CT5qusaa+zmRWs167 github.com/googleapis/gax-go v2.0.2+incompatible/go.mod h1:SFVmujtThgffbyetf+mdk2eWhX2bMyUtNHzFKcPA9HY= github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= -github.com/googleapis/gnostic v0.4.1/go.mod h1:LRhVm6pbyptWbWbuZ38d1eyptfvIytN3ir6b65WBswg= github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= github.com/gordonklaus/ineffassign v0.0.0-20200309095847-7953dde2c7bf/go.mod h1:cuNKsD1zp2v6XfE/orVX2QE1LC+i254ceGcVeDT3pTU= github.com/goreleaser/goreleaser v0.134.0/go.mod h1:ZT6Y2rSYa6NxQzIsdfWWNWAlYGXGbreo66NmE+3X3WQ= github.com/goreleaser/nfpm v1.2.1/go.mod h1:TtWrABZozuLOttX2uDlYyECfQX7x5XYkVxhjYcR6G9w= github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg= -github.com/gorilla/handlers v0.0.0-20150720190736-60c7bfde3e33/go.mod h1:Qkdc/uu4tH4g6mTK6auzZ766c4CA0Ng8+o/OAirnOIQ= github.com/gorilla/mux v1.6.2/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= -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.8.0 h1:i40aqfkR1h2SlN9hojwV5ZA91wcXFOvkdNIeFDP5koI= -github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So= github.com/gorilla/websocket v0.0.0-20170926233335-4201258b820c/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0Ufc= github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= -github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA= github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= github.com/grpc-ecosystem/go-grpc-middleware v1.0.1-0.20190118093823-f849b5445de4/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= github.com/grpc-ecosystem/go-grpc-middleware v1.2.2/go.mod h1:EaizFBKfUKtMIF5iaDEhniwNedqGo9FuLFzppDr3uwI= @@ -602,7 +412,6 @@ github.com/hashicorp/consul/api v1.1.0/go.mod h1:VmuI/Lkw1nC05EYQWNKwWGbkg+FbDBt github.com/hashicorp/consul/api v1.3.0/go.mod h1:MmDNSzIMUjNpY/mQ398R4bk2FnqQLoPndWW5VkKPlCE= github.com/hashicorp/consul/sdk v0.1.1/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8= github.com/hashicorp/consul/sdk v0.3.0/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8= -github.com/hashicorp/errwrap v0.0.0-20141028054710-7554cd9344ce/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= github.com/hashicorp/go-hclog v0.9.2/go.mod h1:5CU+agLiy3J7N7QjHK5d05KxGsuXiQLrjA0H7acj2lQ= @@ -612,7 +421,6 @@ github.com/hashicorp/go-immutable-radix v1.3.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjh github.com/hashicorp/go-memdb v1.3.2 h1:RBKHOsnSszpU6vxq80LzC2BaQjuuvoyaQbkLTf7V7g8= github.com/hashicorp/go-memdb v1.3.2/go.mod h1:Mluclgwib3R93Hk5fxEfiRhB+6Dar64wWh71LpNSe3g= github.com/hashicorp/go-msgpack v0.5.3/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM= -github.com/hashicorp/go-multierror v0.0.0-20161216184304-ed905158d874/go.mod h1:JMRHfdO9jKNzS/+BTlxCjKNQHg/jZAft8U7LloJvN7I= github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk= github.com/hashicorp/go-retryablehttp v0.6.4/go.mod h1:vAew36LZh98gCBJNLH42IQ1ER/9wtLZZ8meHqQvEYWY= github.com/hashicorp/go-rootcerts v1.0.0/go.mod h1:K6zTfqpRlCUIjkwsN4Z+hiSfzSTQa6eBIzfwKfwNnHU= @@ -639,18 +447,13 @@ github.com/hudl/fargo v1.3.0/go.mod h1:y3CKSmjA+wD2gak7sUSXTAoopbhU08POFhmITJgmK github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/imdario/mergo v0.3.4/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= -github.com/imdario/mergo v0.3.5/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= github.com/imdario/mergo v0.3.8/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= github.com/imdario/mergo v0.3.9/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= -github.com/imdario/mergo v0.3.10/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA= -github.com/imdario/mergo v0.3.11/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA= -github.com/imdario/mergo v0.3.12/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/influxdata/influxdb1-client v0.0.0-20191209144304-8bf82d3c094d/go.mod h1:qj24IKcXYK6Iy9ceXlo3Tc+vtHo9lIhSX5JddghvEPo= github.com/ishidawataru/sctp v0.0.0-20210707070123-9a39160e9062 h1:G1+wBT0dwjIrBdLy0MIG0i+E4CQxEnedHXdauJEIH6g= github.com/ishidawataru/sctp v0.0.0-20210707070123-9a39160e9062/go.mod h1:co9pwDoBCm1kGxawmb4sPq0cSIOOWNPT4KnHotMP1Zg= -github.com/j-keck/arping v0.0.0-20160618110441-2cf9dc699c56/go.mod h1:ymszkNOg6tORTn+6F6j+Jc8TOr5osrynvN6ivFWZ2GA= github.com/jarcoal/httpmock v1.0.5/go.mod h1:ATjnClrvW/3tijVmpL/va5Z3aAyGvqU3gCT8nX0Txik= github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod h1:1lJo3i6rXxKeerYnT8Nvf0QmHCRC1n8sfWVwXF2Frvo= github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI= @@ -659,7 +462,6 @@ github.com/jhump/protoreflect v1.8.2/go.mod h1:7GcYQDdMU/O/BBrl/cX6PNHpXh6cenjd8 github.com/jhump/protoreflect v1.9.0 h1:npqHz788dryJiR/l6K/RUQAyh2SwV91+d1dnh4RjO9w= github.com/jhump/protoreflect v1.9.0/go.mod h1:7GcYQDdMU/O/BBrl/cX6PNHpXh6cenjd8pneu5yW7Tg= 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.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U= @@ -687,18 +489,13 @@ github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvW github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= -github.com/klauspost/compress v1.11.3/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs= -github.com/klauspost/compress v1.11.13/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs= 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.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= 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/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= -github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= github.com/kr/pretty v0.2.1 h1:Fmg33tUaq4/8ym9TJN1x7sLJnHVwhP33CNkpYV/7rwI= github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= -github.com/kr/pty v1.1.5/go.mod h1:9r2w37qlBe7rQ6e1fg1S/9xpWHSnaqNdHD3WcMdbPDA= github.com/kr/pty v1.1.8/go.mod h1:O1sed60cT9XZ5uDucP5qwvh+TE3NnUj51EiZO/lmSfw= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= @@ -711,10 +508,6 @@ github.com/lightstep/lightstep-tracer-common/golang/gogo v0.0.0-20190605223551-b github.com/lightstep/lightstep-tracer-go v0.18.1/go.mod h1:jlF1pusYV4pidLvZ+XD0UBX0ZE6WURAspgAczcDHrL4= github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= -github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= -github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= -github.com/mailru/easyjson v0.7.0/go.mod h1:KAzv3t3aY1NaHWoQz1+4F1ccyAH66Jk7yos7ldAVICs= -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.1/go.mod h1:FuOcm+DKB9mbwrcAfNl7/TZVBZ6rcnceauSikq3lYCQ= github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= @@ -732,7 +525,6 @@ github.com/mattn/go-runewidth v0.0.2/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzp github.com/mattn/go-runewidth v0.0.7/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI= github.com/mattn/go-runewidth v0.0.9 h1:Lm995f3rfxdpd6TSmuVCHVb/QhupuXlYr8sCI/QdE+0= github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI= -github.com/mattn/go-shellwords v1.0.3/go.mod h1:3xCvwCdWdlDJUrvuMn7Wuy9eWs4pE8vqg+NOMyg4B2o= github.com/mattn/go-shellwords v1.0.10/go.mod h1:EZzvwXDESEeg03EKmM+RmDnNOPKG4lLtQsUlTZDWQ8Y= github.com/mattn/go-zglob v0.0.1/go.mod h1:9fxibJccNxU2cnpIKLRRFA7zX7qhkJIQWBb449FYHOo= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= @@ -742,7 +534,6 @@ github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b/go.mod h1:01TrycV0kFyex github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= github.com/miekg/pkcs11 v1.0.2/go.mod h1:XsNlhZGX73bx86s2hdc/FuaLm2CPZJemRLMA+WTFxgs= github.com/miekg/pkcs11 v1.0.3/go.mod h1:XsNlhZGX73bx86s2hdc/FuaLm2CPZJemRLMA+WTFxgs= -github.com/mistifyio/go-zfs v2.1.2-0.20190413222219-f784269be439+incompatible/go.mod h1:8AuVvqP/mXw1px98n46wfvcGfQ4ci2FwoAjKYxuo3Z4= github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc= github.com/mitchellh/copystructure v1.0.0/go.mod h1:SNtv71yrdKgLRyLFxmLdkAbkKEFWgYaq1OVrnRcwhnw= github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= @@ -752,14 +543,8 @@ github.com/mitchellh/gox v0.4.0/go.mod h1:Sd9lOJ0+aimLBi73mGofS1ycjY8lL3uZM3JPS4 github.com/mitchellh/iochan v1.0.0/go.mod h1:JwYml1nuB7xOzsp52dPpHFffvOCDupsG0QubkSMEySY= github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= -github.com/mitchellh/osext v0.0.0-20151018003038-5e2d6d41470f/go.mod h1:OkQIRizQZAeMln+1tSwduZz7+Af5oFlKirV/MSYes2A= github.com/mitchellh/reflectwalk v1.0.0/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw= github.com/mitchellh/reflectwalk v1.0.1/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw= -github.com/moby/locker v1.0.1/go.mod h1:S7SDdo5zpBK84bzzVlKr2V0hz+7x9hWbYC/kq7oQppc= -github.com/moby/sys/mountinfo v0.4.0/go.mod h1:rEr8tzG/lsIZHBtN/JjGG+LMYx9eXgW2JI+6q0qou+A= -github.com/moby/sys/mountinfo v0.4.1/go.mod h1:rEr8tzG/lsIZHBtN/JjGG+LMYx9eXgW2JI+6q0qou+A= -github.com/moby/sys/symlink v0.1.0/go.mod h1:GGDODQmbFOjFsXvfLVn3+ZRxkch54RkSiGqsZeMYowQ= -github.com/moby/term v0.0.0-20200312100748-672ec06f55cd/go.mod h1:DdlQx2hp0Ss5/fLikoLlEeIYiATotOjgB//nb973jeo= github.com/moby/term v0.0.0-20210619224110-3f7ff695adc6 h1:dcztxKSvZ4Id8iPpHERQBbIJfabdt4wUm5qy3wOL2Zc= github.com/moby/term v0.0.0-20210619224110-3f7ff695adc6/go.mod h1:E2VnQOmVuvZB6UYnnDB0qG5Nq/1tD9acaOpo6xmt0Kw= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= @@ -771,14 +556,10 @@ github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3Rllmb github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826/go.mod h1:TaXosZuwdSHYgviHp1DAtfrULt5eUgsSMsZf+YrPgl8= github.com/morikuni/aec v1.0.0 h1:nP9CBfwrvYnBRgY6qfDQkygYDmYwOilePFkwzv4dU8A= github.com/morikuni/aec v1.0.0/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc= -github.com/mrunalp/fileutils v0.5.0/go.mod h1:M1WthSahJixYnrXQl/DFQuteStB1weuxD2QJNHXfbSQ= -github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= -github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/mwitkow/go-proto-validators v0.0.0-20180403085117-0950a7990007/go.mod h1:m2XC9Qq0AlmmVksL6FktJCdTYyLk7V3fKyp0sl1yWQo= github.com/mwitkow/go-proto-validators v0.2.0/go.mod h1:ZfA1hW+UH/2ZHOWvQ3HnQaU0DtnpXu850MZiy+YUgcc= -github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw= github.com/nats-io/jwt v0.3.0/go.mod h1:fRYCDE99xlTsqUzISS1Bi75UBJ6ljOJQOAAu5VglpSg= github.com/nats-io/jwt v0.3.2/go.mod h1:/euKqTS1ZD+zzjYrY7pseZrTtWQSjujC7xjPc8wL6eU= github.com/nats-io/nats-server/v2 v2.1.2/go.mod h1:Afk+wRZqkMQs/p45uXdrVLuab3gwv3Z8C4HTBu8GD/k= @@ -786,7 +567,6 @@ github.com/nats-io/nats.go v1.9.1/go.mod h1:ZjDU1L/7fJ09jvUSRVBR2e7+RnLiiIQyqyzE github.com/nats-io/nkeys v0.1.0/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxziKVo7w= github.com/nats-io/nkeys v0.1.3/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxziKVo7w= github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c= -github.com/ncw/swift v1.0.47/go.mod h1:23YIA4yWVnGwv2dQlN4bB7egfYX6YLn0Yo/S6zZO/ZM= github.com/nishanths/predeclared v0.0.0-20200524104333-86fad755b4d3/go.mod h1:nt3d53pc1VYcphSCIaYAJtnPYnr3Zyn8fMq2wvPGPso= github.com/nxadm/tail v1.4.4 h1:DQuhQpB1tVlglWS2hLQ5OV6B5r8aGxSrPc5Qo6uTN78= github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= @@ -797,52 +577,23 @@ github.com/olekukonko/tablewriter v0.0.0-20170122224234-a0225b3f23b5/go.mod h1:v github.com/olekukonko/tablewriter v0.0.4/go.mod h1:zq6QwlOf5SlnkVbMSr5EoBv3636FWnp+qbPhuoO21uA= github.com/olekukonko/tablewriter v0.0.5 h1:P2Ga83D34wi1o9J6Wh1mRuqd4mF/x/lgBS7N7AbDhec= github.com/olekukonko/tablewriter v0.0.5/go.mod h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6HuIJcUGPhkA7kY= -github.com/onsi/ginkgo v0.0.0-20151202141238-7f8ab55aaf3b/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= -github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.4.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.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= -github.com/onsi/ginkgo v1.10.1/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.10.3/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 v0.0.0-20151007035656-2152b45fa28a/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA= -github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA= github.com/onsi/gomega v1.3.0/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA= github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= github.com/onsi/gomega v1.5.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= -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.3 h1:gph6h/qe9GSUw1NhH1gp+qb+h8rXD8Cy60Z32Qw3ELA= github.com/onsi/gomega v1.10.3/go.mod h1:V9xEwhxec5O8UDM77eCW8vLymOMltsqPVYWrpDsH8xc= github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk= -github.com/opencontainers/go-digest v0.0.0-20170106003457-a6d0ee40d420/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s= -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-rc1.0.20180430190053-c9281466c8b2/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s= github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U= github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM= -github.com/opencontainers/image-spec v1.0.0/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0= -github.com/opencontainers/image-spec v1.0.1/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0= github.com/opencontainers/image-spec v1.0.2 h1:9yCKha/T5XdGtO0q9Q9a6T5NUCsTn/DrBg0D7ufOcFM= github.com/opencontainers/image-spec v1.0.2/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0= -github.com/opencontainers/runc v0.0.0-20190115041553-12f6a991201f/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U= -github.com/opencontainers/runc v0.1.1/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U= -github.com/opencontainers/runc v1.0.0-rc8.0.20190926000215-3e425f80a8c9/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U= -github.com/opencontainers/runc v1.0.0-rc9/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U= -github.com/opencontainers/runc v1.0.0-rc93/go.mod h1:3NOsor4w32B2tC0Zbl8Knk4Wg84SM2ImC1fxBuqJ/H0= -github.com/opencontainers/runc v1.0.2/go.mod h1:aTaHFFwQXuA71CiyxOdFFIorAoemI04suvGRQFzWTD0= -github.com/opencontainers/runtime-spec v0.1.2-0.20190507144316-5b71a03e2700/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= -github.com/opencontainers/runtime-spec v1.0.1/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= -github.com/opencontainers/runtime-spec v1.0.2-0.20190207185410-29686dbc5559/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= -github.com/opencontainers/runtime-spec v1.0.2/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= -github.com/opencontainers/runtime-spec v1.0.3-0.20200929063507-e6143ca7d51d/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= -github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417/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/opencontainers/selinux v1.6.0/go.mod h1:VVGKuOLlE7v4PJyT6h7mNWvq1rzqiriPsEqVhc+svHE= -github.com/opencontainers/selinux v1.8.0/go.mod h1:RScLhm78qiWa2gbVCcGkC7tCGdgk3ogry1nUQF8Evvo= -github.com/opencontainers/selinux v1.8.2/go.mod h1:MUIHuUEvKB1wtJjQdOyYRgOnLD2xAPP8dBsCoU0KuF8= github.com/opentracing-contrib/go-observer v0.0.0-20170622124052-a52f23424492/go.mod h1:Ngi6UdF0k5OKD5t5wlmGhe/EDKPoUM3BXZSSfIuJbis= github.com/opentracing/basictracer-go v1.0.0/go.mod h1:QfBfYuafItcjQuMwinw9GhYKwFXS9KnPs5lxoYwgW74= github.com/opentracing/opentracing-go v1.0.2/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= @@ -861,15 +612,12 @@ github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FI github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k= github.com/pelletier/go-buffruneio v0.2.0/go.mod h1:JkE26KsDizTr40EUHkXVtNPvgGtbSNq5BcowyYOWdKo= github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= -github.com/pelletier/go-toml v1.8.1/go.mod h1:T2/BmBdy8dvIRq1a/8aqjN41wvWlN4lrapLU/GW4pbc= github.com/performancecopilot/speed v3.0.0+incompatible/go.mod h1:/CLtqpZ5gBg1M9iaPbIdPPGyKcA8hKdoy6hAWba7Yac= -github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU= github.com/phayes/permbits v0.0.0-20160117212716-f7e3ac5e859d h1:fSZq3euivSKzJceaZzdTEpPAyzXNfQf4Xay0jLYYK3g= github.com/phayes/permbits v0.0.0-20160117212716-f7e3ac5e859d/go.mod h1:3uODdxMgOaPYeWU7RzZLxVtJHZ/x1f/iHkBZuKJDzuY= github.com/pierrec/lz4 v1.0.2-0.20190131084431-473cd7ce01a1/go.mod h1:3/3N9NVKO0jef7pBehbT1qWhCMrIgbYNnFAZCqQ5LRc= github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= 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= @@ -878,8 +626,6 @@ github.com/pmezard/go-difflib v0.0.0-20151028094244-d8ed2627bdf0/go.mod h1:iKH77 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/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI= -github.com/pquerna/cachecontrol v0.0.0-20171018203845-0dec1b30a021/go.mod h1:prYjPmNq4d1NPVmpShWobRqXY3q7Vp+80DqgxxUrUIA= -github.com/prometheus/client_golang v0.0.0-20180209125602-c332b6f63c06/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829/go.mod h1:p2iRAGwDERtqlqzRXnrOVns+ignqQo//hLXqYxZYVNs= github.com/prometheus/client_golang v0.9.3/go.mod h1:/TN21ttK/J9q6uSwhBd54HahCDft0ttaMvbicHlPoso= @@ -891,7 +637,6 @@ github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP github.com/prometheus/client_golang v1.10.0/go.mod h1:WJM3cc3yu7XKBKa/I8WeZm+V3eltZnBwfENSU7mdogU= github.com/prometheus/client_golang v1.11.0 h1:HNkLOAEQMIDv/K+04rukrLx6ch7msSRwf3/SASFAGtQ= github.com/prometheus/client_golang v1.11.0/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= -github.com/prometheus/client_model v0.0.0-20171117100541-99fa1f4be8e5/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190115171406-56726106282f/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= @@ -899,7 +644,6 @@ github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1: github.com/prometheus/client_model v0.1.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.2.0 h1:uq5h0d+GuxiXLJLNABMgp2qUWDPiLvgCzz2dUR+/W/M= github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= -github.com/prometheus/common v0.0.0-20180110214958-89604d197083/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= github.com/prometheus/common v0.2.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= github.com/prometheus/common v0.4.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= @@ -911,14 +655,11 @@ github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB8 github.com/prometheus/common v0.18.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= github.com/prometheus/common v0.26.0 h1:iMAkS2TDoNWnKM+Kopnx/8tnEStIfpYA0ur0xQzzhMQ= github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9VFqTh1DIvc= -github.com/prometheus/procfs v0.0.0-20180125133057-cb4147076ac7/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= -github.com/prometheus/procfs v0.0.0-20190522114515-bc1a522cf7b1/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/go.mod h1:4A/X28fw3Fc593LaREMrKMqOKvUAntwMDaekg4FpcdQ= github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A= github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= github.com/prometheus/procfs v0.2.0/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= @@ -941,21 +682,15 @@ github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR github.com/russross/blackfriday/v2 v2.0.1 h1:lPqVAte+HuHNfhJ/0LC98ESWRz8afy9tM/0RK8m9o+Q= github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= -github.com/safchain/ethtool v0.0.0-20190326074333-42ed695e3de8/go.mod h1:Z0q5wiBQGYcxhMZ6gUqHn6pYNLypFAvaL3UvgZLR0U4= github.com/samuel/go-zookeeper v0.0.0-20190923202752-2cc03de413da/go.mod h1:gi+0XIa01GRL2eRQVjQkKGqKF3SF9vZR/HnPullcV2E= github.com/sassoftware/go-rpmutils v0.0.0-20190420191620-a8f1baeba37b/go.mod h1:am+Fp8Bt506lA3Rk3QCmSqmYmLMnPDhdDUcosQCAx+I= -github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0= github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= -github.com/seccomp/libseccomp-golang v0.9.1/go.mod h1:GbW5+tmTXfcxTToHLXlScSlAvWlF4P2Ca7zGrPiEpWo= github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo= github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM= github.com/sergi/go-diff v1.2.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM= github.com/shurcooL/sanitized_anchor_name v1.0.0 h1:PdmoCO6wvbs+7yrJyMORt4/BmY5IYyJwS/kOiWx8mHo= 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.0.6/go.mod h1:pMByvHTf9Beacp5x1UXfOR9xyW/9antXMhjMPG0dEzc= github.com/sirupsen/logrus v1.2.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/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88= github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= @@ -964,7 +699,6 @@ github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= github.com/smartystreets/assertions v1.0.0/go.mod h1:kHHU4qYBaI3q23Pp3VPrmWhuIUrLW/7eUrw0BU5VaoM= github.com/smartystreets/go-aws-auth v0.0.0-20180515143844-0c1422d1fdb9/go.mod h1:SnhjPscd9TpLiy1LpzGSKh3bXCfxxXuqd9xmQJy3slM= -github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= github.com/smartystreets/gunit v1.0.0/go.mod h1:qwPWnhz6pn0NnRBP++URONOVyNkPyr4SauJk4cUOwJs= github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM= @@ -974,10 +708,8 @@ github.com/soheilhy/cmux v0.1.5/go.mod h1:T7TcVDs9LWfQgPlPsdngu6I6QIoyIFZDDC6sNE github.com/sony/gobreaker v0.4.1/go.mod h1:ZKptC7FHNvhBz7dN2LGjPVBz2sZJmc0/PkyDJOjmxWY= github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ= -github.com/spf13/afero v1.2.2/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTdifk= github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= github.com/spf13/cobra v0.0.1/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ= -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/go.mod h1:/6GTrnGXV9HjY+aR4k0oJ5tcvakLuG6EuKReYlHNrgE= @@ -985,9 +717,7 @@ github.com/spf13/cobra v1.1.1/go.mod h1:WnodtKOvamDL/PwE2M4iKs8aMDBZ5Q5klgD3qfVJ github.com/spf13/cobra v1.1.3 h1:xghbfqPkxzxP3C/f3n5DdpAbdKLj4ZE4BWQI362l53M= github.com/spf13/cobra v1.1.3/go.mod h1:pGADOWyqRD/YMrPZigI/zbliZ2wVD/23d+is3pSWzOo= github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo= -github.com/spf13/pflag v0.0.0-20170130214245-9ff6c6923cff/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= github.com/spf13/pflag v1.0.0/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= -github.com/spf13/pflag v1.0.1-0.20171106142849-4c012f6dcd95/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= github.com/spf13/pflag v1.0.1/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= @@ -996,16 +726,13 @@ github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DM github.com/spf13/viper v1.4.0/go.mod h1:PTJ7Z/lr49W6bUbkmS1V3by4uWynFiR9p7+dSq/yZzE= github.com/spf13/viper v1.7.0/go.mod h1:8WkrPz2fc9jxqZNCJI/76HCieCp4Q8HaLFoCha5qpdg= github.com/src-d/gcfg v1.4.0/go.mod h1:p/UMsR43ujA89BJY9duynAwIpvqEujIH/jFlfL7jWoI= -github.com/stefanberger/go-pkcs11uri v0.0.0-20201008174630-78d3cae3a980/go.mod h1:AO3tvPzVZ/ayst6UlUKUv6rcPQInYe3IknH3jYhAKu8= github.com/streadway/amqp v0.0.0-20190404075320-75d898a42a94/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw= github.com/streadway/amqp v0.0.0-20190827072141-edfb9018d271/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw= github.com/streadway/handy v0.0.0-20190108123426-d5acb3125c2a/go.mod h1:qNTQ5P5JnDBl6z3cMAg/SywNDC5ABu5ApDIw6lUbRmI= -github.com/stretchr/objx v0.0.0-20180129172003-8a3f7159479f/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= 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/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE= github.com/stretchr/testify v0.0.0-20170130113145-4d4bfba8f1d1/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= -github.com/stretchr/testify v0.0.0-20180303142811-b89eecf5ca5d/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= @@ -1014,10 +741,6 @@ github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= -github.com/syndtr/gocapability v0.0.0-20170704070218-db04d3cc01c8/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww= -github.com/syndtr/gocapability v0.0.0-20180916011248-d98352740cb2/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww= -github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww= -github.com/tchap/go-patricia v2.2.6+incompatible/go.mod h1:bmLyhP68RS6kStMGxByiQ23RP/odRBOTVjwp2cDyi6I= github.com/tedsuo/ifrit v0.0.0-20220120221754-dd274de71113 h1:PnxSSxsUvOqMh7nslHscii/GV/Y9ZflmkZ2oEEEIGj4= github.com/tedsuo/ifrit v0.0.0-20220120221754-dd274de71113/go.mod h1:eyZnKCc955uh98WQvzOm0dgAeLnf2O0Rz0LPoC5ze+0= github.com/thecodeteam/gosync v0.1.0 h1:RcD9owCaiK0Jg1rIDPgirdcLCL1jCD6XlDVSg0MfHmE= @@ -1038,25 +761,12 @@ github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljT github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLYF3GoBXY= github.com/ulikunitz/xz v0.5.6/go.mod h1:2bypXElzHzzJZwzH67Y6wb67pO62Rzfn7BSiF4ABRW8= github.com/ulikunitz/xz v0.5.7/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14= -github.com/urfave/cli v0.0.0-20171014202726-7bc6a0acffa5/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA= github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA= github.com/urfave/cli v1.22.1/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= -github.com/urfave/cli v1.22.2/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= github.com/urfave/cli v1.22.4 h1:u7tSpNPPswAFymm8IehJhy4uJMlUuU/GmqSkvJ1InXA= github.com/urfave/cli v1.22.4/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= -github.com/vishvananda/netlink v0.0.0-20181108222139-023a6dafdcdf/go.mod h1:+SR5DhBJrl6ZM7CoCKvpw5BKroDKQ+PJqOg65H/2ktk= -github.com/vishvananda/netlink v1.1.0/go.mod h1:cTgwzPIzzgDAYoQrMm0EdrjRUBkTqKYppBueQtXaqoE= -github.com/vishvananda/netlink v1.1.1-0.20201029203352-d40f9887b852/go.mod h1:twkDnbuQxJYemMlGd4JFIcuhgX83tXhKS2B/PRMpOho= -github.com/vishvananda/netns v0.0.0-20180720170159-13995c7128cc/go.mod h1:ZjcWmFBXmLKZu9Nxj3WKYEafiSqer2rnvPr0en9UNpI= -github.com/vishvananda/netns v0.0.0-20191106174202-0a2b9b5464df/go.mod h1:JP3t17pCcGlemwknint6hfoeCVQrEMVwxRLRjXpq+BU= -github.com/vishvananda/netns v0.0.0-20200728191858-db3c7e526aae/go.mod h1:DD4vA1DwXk04H54A1oHXtwZmA0grkVMdPxx/VGLCah0= -github.com/willf/bitset v1.1.11-0.20200630133818-d5bec3311243/go.mod h1:RjeCKbqT1RxIR/KWY6phxZiaY1IyutSBfGjNPySAYV4= -github.com/willf/bitset v1.1.11/go.mod h1:83CECat5yLh5zVOf4P1ErAgKA5UDvKtgyUABdr3+MjI= github.com/xanzy/go-gitlab v0.31.0/go.mod h1:sPLojNBn68fMUWSxIJtdVVIP8uSBYqesTfDUseX11Ug= github.com/xanzy/ssh-agent v0.2.1/go.mod h1:mLlQY/MoOhWBj+gOGMQkOeiEvkx+8pJSI+0Bx9h2kr4= -github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU= -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/xi2/xz v0.0.0-20171230120015-48954b6210f8/go.mod h1:HUYIGzjTL3rfEspMxjDjgmT5uz5wzYJKVo23qUhYTos= github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2 h1:eY9dn8+vbi4tKz5Qo6v2eYzo7kUS51QINcR5jNpbZS8= github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= @@ -1066,17 +776,13 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= -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= go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= go.etcd.io/bbolt v1.3.5/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ= go.etcd.io/bbolt v1.3.6 h1:/ecaJf0sk1l4l6V4awd65v2C3ILy7MSj+s/x1ADCIMU= go.etcd.io/bbolt v1.3.6/go.mod h1:qXsaaIqmgQH0T+OPdb99Bf+PKfBBQVAdyD6TY9G8XM4= +go.etcd.io/etcd v0.0.0-20191023171146-3cf2f69b5738 h1:VcrIfasaLFkyjk6KNlXQSzO+B0fZcnECiDrKJsfxka0= go.etcd.io/etcd v0.0.0-20191023171146-3cf2f69b5738/go.mod h1:dnLIgRNXwCJa5e+c6mIZCrds/GIG4ncV9HhK5PX7jPg= -go.etcd.io/etcd v0.5.0-alpha.5.0.20200910180754-dd1b699fc489 h1:1JFLBqwIgdyHN1ZtgjTBwO+blA6gVOmZurpiMEsETKo= -go.etcd.io/etcd v0.5.0-alpha.5.0.20200910180754-dd1b699fc489/go.mod h1:yVHk9ub3CSBatqGNg7GRmsnfLWtoW60w4eDYfh7vHDg= go.etcd.io/etcd/api/v3 v3.5.0-alpha.0/go.mod h1:mPcW6aZJukV6Aa81LSKpBjQXTWlXB5r74ymPoSWa3Sw= go.etcd.io/etcd/api/v3 v3.5.0/go.mod h1:cbVKeC6lCfl7j/8jBhAK6aIYO9XOjdptoxU/nLQcPvs= go.etcd.io/etcd/api/v3 v3.5.1 h1:v28cktvBq+7vGyJXF8G+rWJmj+1XUmMtqcLnH8hDocM= @@ -1119,7 +825,6 @@ go.etcd.io/etcd/v3 v3.5.0-alpha.0/go.mod h1:JZ79d3LV6NUfPjUxXrpiFAYcjhT+06qqw+i2 go.etcd.io/etcd/v3 v3.5.0/go.mod h1:FldM0/VzcxYWLvWx1sdA7ghKw7C3L2DvUTzGrcEtsC4= go.etcd.io/etcd/v3 v3.5.1 h1:4PnioKThFqwnPeopxIFjmzvr5dS0Px7cLd3vX70cnrU= go.etcd.io/etcd/v3 v3.5.1/go.mod h1:9UpqH944lLFM2t9KGfGzDIRWDOBAKVwlI/wjiw+WYIk= -go.mozilla.org/pkcs7 v0.0.0-20200128120323-432b2356ecb1/go.mod h1:SNgMg+EgDFwmvSmLRTNKC5fegJjB7v23qTQ0XLGUNHk= go.opencensus.io v0.15.0/go.mod h1:UffZAU+4sDEINUGP/B7UfBBkq4fqLu9zXAX7ke6CHW0= go.opencensus.io v0.20.1/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk= go.opencensus.io v0.20.2/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk= @@ -1173,10 +878,8 @@ go.uber.org/zap v1.16.0/go.mod h1:MA8QOfq0BHJwdXa996Y4dYkAqRKB8/1K1QMMZVaNZjQ= go.uber.org/zap v1.17.0 h1:MTjgFu6ZLKvY6Pvaqk97GlxNBuMpV4Hy/3P6tRGlI2U= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= gocloud.dev v0.19.0/go.mod h1:SmKwiR8YwIMMJvQBKLsC3fHNyMwXLw3PMDO+VVteJMI= -golang.org/x/crypto v0.0.0-20171113213409-9f005a07e0d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20180501155221-613d6eafa307/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= -golang.org/x/crypto v0.0.0-20181009213950-7c1a557ab941/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190219172222-a4c6cb3142f2/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= @@ -1184,13 +887,11 @@ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACk golang.org/x/crypto v0.0.0-20190426145343-a29dc8fdc734/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20191002192127-34f69633bfdc/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20191117063200-497ca9f6d64f/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2 h1:It14KIkyBFYkHkwZ7k45minvA9aorojkyjGk9KJ5B/w= golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= @@ -1208,7 +909,6 @@ golang.org/x/exp v0.0.0-20200331195152-e8c3332aa8e5/go.mod h1:4M0jN8W1tt0AVLNr8H golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= -golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= @@ -1232,7 +932,6 @@ golang.org/x/mod v0.4.2 h1:Gz96sIWK3OalVv/I/qNygP42zyoKp3xptRVCWRFEBvo= golang.org/x/mod v0.4.2/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-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20181011144130-49bb7cea24b1/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181108082009-03003ca0c849/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -1252,10 +951,8 @@ golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLL golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20191002035440-2ec189313ef0/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20191004110552-13f9640d40b9/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20191119073136-fc4aabc6c914/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= @@ -1334,40 +1031,27 @@ golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7w 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-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190514135907-3a4b5fb9f71f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190522044717-8097e1b27ff5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190602015325-4c4f7f33c9ed/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190606203320-7fc4e5ec1444/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190616124812-15dcb6c0061f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190620070143-6f217b454f45/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190801041406-cbf593c0f2f3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190812073006-9eafafc0a87e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/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-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191022100944-742c48ecaeb7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191115151921-52ab43148777/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191119060738-e882bf8e40c2/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191210023423-ac6580df4449/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191220142924-d4481acd189f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200120151820-655fe14d7479/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200124204421-9fbb57f87de9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200217220822-9197077df867/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -1378,23 +1062,14 @@ golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200622214017-ed371f2e16b4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200728102440-3e129f6d46b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200817155316-9781c653f443/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200905004654-be1d3432aa8f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200909081042-eff7692f9009/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200916030750-2334cc1a136f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200922070232-aee5d888a860/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200923182605-d9f96fdee20d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201009025420-dfb3f7c4e634/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20201112073958-5cba982894dd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20201117170446-d9b008d0a637/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20201202213521-69691e467435/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210104204734-6f8348627aad/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -1403,12 +1078,10 @@ golang.org/x/sys v0.0.0-20210305230114-8fe3ee5dd75b/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210309074719-68d13333faf2/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210315160823-c6e025ad8005/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210324051608-47abb6519492/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210412220455-f1c623a9e750/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210426230700-d19ff857e887/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210503080704-8803ae5d1324/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210514084401-e8d321eab015/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= @@ -1447,7 +1120,6 @@ golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBn golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= -golang.org/x/tools v0.0.0-20190614205625-5aca471b1d59/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= golang.org/x/tools v0.0.0-20190624222133-a101b041ded4/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= @@ -1510,7 +1182,6 @@ golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/api v0.0.0-20160322025152-9bf6e6e569ff/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0= google.golang.org/api v0.3.1/go.mod h1:6wY9I6uQWHQ8EM57III9mq/AjF+i8G65rmVagqKMtkk= google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE= google.golang.org/api v0.5.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE= @@ -1555,7 +1226,6 @@ google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCID google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c= google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= -google.golang.org/cloud v0.0.0-20151119220103-975617b05ea8/go.mod h1:0H1ncTHf11KCFhTc/+EFRbzSCOZx+VUbRMk55Yv5MYk= google.golang.org/genproto v0.0.0-20211118181313-81c1377c94b1 h1:b9mVrqYfq3P4bCdaLg1qtBnPzUYgglsIdjZkL/fQVOE= google.golang.org/genproto v0.0.0-20211118181313-81c1377c94b1/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= google.golang.org/grpc v1.41.0 h1:f+PlOh7QV4iIJkPrx5NQ7qaNGFQ3OTse67yaDHfju4E= @@ -1563,10 +1233,8 @@ google.golang.org/grpc v1.41.0/go.mod h1:U3l9uK9J0sini8mHphKoXyaqDA/8VyGnDee1zzI google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw= google.golang.org/protobuf v1.27.1 h1:SnqbnDw1V7RiZcXPx5MEeqPv2s79L9i7BJUlG/+RurQ= google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= -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= @@ -1576,17 +1244,12 @@ gopkg.in/cheggaaa/pb.v1 v1.0.28/go.mod h1:V/YB90LKu/1FcN3WVnfiiE5oMCibMjukxqG/qS gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= gopkg.in/gcfg.v1 v1.2.3/go.mod h1:yesOnuUOFQAhST5vPY4nbZsb/huCgGGXlipJsBn0b3o= -gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2/go.mod h1:Xk6kEKp8OKb+X14hQBKWaSkCsqBpgog8nAV2xsGOxlo= gopkg.in/go-playground/assert.v1 v1.2.1/go.mod h1:9RXL0bg/zibRAgZUYszZSwO/z8Y/a8bDuhia5mkpMnE= gopkg.in/go-playground/validator.v9 v9.29.1/go.mod h1:+c9/zcJMFNgbLvly1L1V+PpxWdVbfP1avr/N00E2vyQ= -gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw= gopkg.in/ini.v1 v1.51.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/natefinch/lumberjack.v2 v2.0.0 h1:1Lc07Kr7qY4U2YPouBjpCLxpiyxIVoxqXgkXLknAOE8= gopkg.in/natefinch/lumberjack.v2 v2.0.0/go.mod h1:l0ndWWf7gzL7RNwBG7wST/UCcT4T24xpD6X8LsfU/+k= gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo= -gopkg.in/square/go-jose.v2 v2.2.2/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI= -gopkg.in/square/go-jose.v2 v2.3.1/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI= -gopkg.in/square/go-jose.v2 v2.5.1/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI= gopkg.in/src-d/go-billy.v4 v4.3.2/go.mod h1:nDjArDMp+XMs1aFAESLRjfGSgfvoYN0hDfzEk0GjC98= gopkg.in/src-d/go-git-fixtures.v3 v3.5.0/go.mod h1:dLBcvytrw/TYZsNTWCnkNF2DSIlzWYqTe3rJR56Ac7g= gopkg.in/src-d/go-git.v4 v4.13.1/go.mod h1:nx5NYcxdKxq5fpltdHnPa2Exj4Sx0EclMWZQbYDu2z8= @@ -1606,10 +1269,7 @@ gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo= gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -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/go.mod h1:3SzNCllyD9/Y+b5r9JIKQ474KzkZyqLqEfYqMsX94Bk= -gotest.tools/v3 v3.0.3/go.mod h1:Z7Lb0S5l+klDB31fvDQX8ss/FlKDxtlFlw3Oa8Ymbl8= gotest.tools/v3 v3.1.0 h1:rVV8Tcg/8jHUkPUorwjaMTtemIMVXfIPKiOqnhEhakk= gotest.tools/v3 v3.1.0/go.mod h1:fHy7eyTmJFO5bQbUsEGQ1v4m2J3Jz9eWL54TP2/ZuYQ= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= @@ -1619,39 +1279,10 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= -k8s.io/api v0.20.1/go.mod h1:KqwcCVogGxQY3nBlRpwt+wpAMF/KjaCc7RpywacvqUo= -k8s.io/api v0.20.4/go.mod h1:++lNL1AJMkDymriNniQsWRkMDzRaX2Y/POTUi8yvqYQ= -k8s.io/api v0.20.6/go.mod h1:X9e8Qag6JV/bL5G6bU8sdVRltWKmdHsFUGS3eVndqE8= -k8s.io/apimachinery v0.20.1/go.mod h1:WlLqWAHZGg07AeltaI0MV5uk1Omp8xaN0JGLY6gkRpU= -k8s.io/apimachinery v0.20.4/go.mod h1:WlLqWAHZGg07AeltaI0MV5uk1Omp8xaN0JGLY6gkRpU= -k8s.io/apimachinery v0.20.6/go.mod h1:ejZXtW1Ra6V1O5H8xPBGz+T3+4gfkTCeExAHKU57MAc= -k8s.io/apiserver v0.20.1/go.mod h1:ro5QHeQkgMS7ZGpvf4tSMx6bBOgPfE+f52KwvXfScaU= -k8s.io/apiserver v0.20.4/go.mod h1:Mc80thBKOyy7tbvFtB4kJv1kbdD0eIH8k8vianJcbFM= -k8s.io/apiserver v0.20.6/go.mod h1:QIJXNt6i6JB+0YQRNcS0hdRHJlMhflFmsBDeSgT1r8Q= -k8s.io/client-go v0.20.1/go.mod h1:/zcHdt1TeWSd5HoUe6elJmHSQ6uLLgp4bIJHVEuy+/Y= -k8s.io/client-go v0.20.4/go.mod h1:LiMv25ND1gLUdBeYxBIwKpkSC5IsozMMmOOeSJboP+k= -k8s.io/client-go v0.20.6/go.mod h1:nNQMnOvEUEsOzRRFIIkdmYOjAZrC8bgq0ExboWSU1I0= -k8s.io/component-base v0.20.1/go.mod h1:guxkoJnNoh8LNrbtiQOlyp2Y2XFCZQmrcg2n/DeYNLk= -k8s.io/component-base v0.20.4/go.mod h1:t4p9EdiagbVCJKrQ1RsA5/V4rFQNDfRlevJajlGwgjI= -k8s.io/component-base v0.20.6/go.mod h1:6f1MPBAeI+mvuts3sIdtpjljHWBQ2cIy38oBIWMYnrM= -k8s.io/cri-api v0.17.3/go.mod h1:X1sbHmuXhwaHs9xxYffLqJogVsnI+f6cPRcgPel7ywM= -k8s.io/cri-api v0.20.1/go.mod h1:2JRbKt+BFLTjtrILYVqQK5jqhI+XNdF6UiGMgczeBCI= -k8s.io/cri-api v0.20.4/go.mod h1:2JRbKt+BFLTjtrILYVqQK5jqhI+XNdF6UiGMgczeBCI= -k8s.io/cri-api v0.20.6/go.mod h1:ew44AjNXwyn1s0U4xCKGodU7J1HzBeZ1MpGrpa5r8Yc= -k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= -k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE= -k8s.io/klog/v2 v2.4.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y= -k8s.io/kube-openapi v0.0.0-20201113171705-d219536bb9fd/go.mod h1:WOJ3KddDSol4tAGcJo0Tvi+dK12EcqSLqcWsryKMpfM= -k8s.io/kubernetes v1.13.0/go.mod h1:ocZa8+6APFNC2tX1DZASIbocyYT5jHzqFVsY5aoB7Jk= -k8s.io/utils v0.0.0-20201110183641-67b214c5f920/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= pack.ag/amqp v0.11.2/go.mod h1:4/cbmt4EJXSKlG6LCfWHoqmN0uFdy5i/+YFz+fTfhV4= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= -sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.14/go.mod h1:LEScyzhFmoF5pso/YSeBstl57mOzx9xlU9n85RGrDQg= -sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.15/go.mod h1:LEScyzhFmoF5pso/YSeBstl57mOzx9xlU9n85RGrDQg= -sigs.k8s.io/structured-merge-diff/v4 v4.0.2/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw= -sigs.k8s.io/structured-merge-diff/v4 v4.0.3/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw= sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o= sigs.k8s.io/yaml v1.2.0 h1:kr/MCeFWJWTwyaHoR9c8EjH9OumOmoF9YGiZd7lFm/Q= sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc= diff --git a/integration/api.go b/integration/api.go index b0042309dd..3d051a608a 100644 --- a/integration/api.go +++ b/integration/api.go @@ -3,7 +3,7 @@ package integration import ( "context" - "github.com/docker/swarmkit/api" + "github.com/moby/swarmkit/v2/api" ) type dummyAPI struct { diff --git a/integration/cluster.go b/integration/cluster.go index 8dfe4a1dd7..0be39bb66b 100644 --- a/integration/cluster.go +++ b/integration/cluster.go @@ -12,13 +12,13 @@ import ( "google.golang.org/grpc" "google.golang.org/grpc/credentials" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/ca" - "github.com/docker/swarmkit/identity" - "github.com/docker/swarmkit/log" - "github.com/docker/swarmkit/manager/encryption" - "github.com/docker/swarmkit/node" - "github.com/docker/swarmkit/testutils" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/ca" + "github.com/moby/swarmkit/v2/identity" + "github.com/moby/swarmkit/v2/log" + "github.com/moby/swarmkit/v2/manager/encryption" + "github.com/moby/swarmkit/v2/node" + "github.com/moby/swarmkit/v2/testutils" "github.com/sirupsen/logrus" ) diff --git a/integration/integration_test.go b/integration/integration_test.go index 30cb0e7d59..00a7bb7bf8 100644 --- a/integration/integration_test.go +++ b/integration/integration_test.go @@ -12,18 +12,18 @@ import ( "testing" "time" - "github.com/docker/swarmkit/node" + "github.com/moby/swarmkit/v2/node" "reflect" "github.com/cloudflare/cfssl/helpers" events "github.com/docker/go-events" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/ca" - cautils "github.com/docker/swarmkit/ca/testutils" - "github.com/docker/swarmkit/identity" - "github.com/docker/swarmkit/manager" - "github.com/docker/swarmkit/testutils" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/ca" + cautils "github.com/moby/swarmkit/v2/ca/testutils" + "github.com/moby/swarmkit/v2/identity" + "github.com/moby/swarmkit/v2/manager" + "github.com/moby/swarmkit/v2/testutils" "github.com/pkg/errors" "github.com/sirupsen/logrus" "github.com/stretchr/testify/require" diff --git a/integration/node.go b/integration/node.go index 3f3d703d11..af4802f859 100644 --- a/integration/node.go +++ b/integration/node.go @@ -10,11 +10,11 @@ import ( "google.golang.org/grpc" - agentutils "github.com/docker/swarmkit/agent/testutils" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/ca" - "github.com/docker/swarmkit/node" - "github.com/docker/swarmkit/testutils" + agentutils "github.com/moby/swarmkit/v2/agent/testutils" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/ca" + "github.com/moby/swarmkit/v2/node" + "github.com/moby/swarmkit/v2/testutils" ) // TestNode is representation of *agent.Node. It stores listeners, connections, diff --git a/manager/allocator/allocator.go b/manager/allocator/allocator.go index b4cc1c9e86..a35039732f 100644 --- a/manager/allocator/allocator.go +++ b/manager/allocator/allocator.go @@ -6,10 +6,10 @@ import ( "github.com/docker/docker/pkg/plugingetter" "github.com/docker/go-events" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/manager/allocator/cnmallocator" - "github.com/docker/swarmkit/manager/state" - "github.com/docker/swarmkit/manager/state/store" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/manager/allocator/cnmallocator" + "github.com/moby/swarmkit/v2/manager/state" + "github.com/moby/swarmkit/v2/manager/state/store" ) // Allocator controls how the allocation stage in the manager is handled. diff --git a/manager/allocator/allocator_linux_test.go b/manager/allocator/allocator_linux_test.go index 7ea85ebe1a..834c5356a1 100644 --- a/manager/allocator/allocator_linux_test.go +++ b/manager/allocator/allocator_linux_test.go @@ -4,9 +4,9 @@ import ( "context" "testing" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/manager/state" - "github.com/docker/swarmkit/manager/state/store" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/manager/state" + "github.com/moby/swarmkit/v2/manager/state/store" "github.com/stretchr/testify/assert" ) diff --git a/manager/allocator/allocator_test.go b/manager/allocator/allocator_test.go index e233986110..082a5c8885 100644 --- a/manager/allocator/allocator_test.go +++ b/manager/allocator/allocator_test.go @@ -9,9 +9,9 @@ import ( "time" "github.com/docker/go-events" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/manager/state" - "github.com/docker/swarmkit/manager/state/store" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/manager/state" + "github.com/moby/swarmkit/v2/manager/state/store" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/manager/allocator/cnmallocator/drivers_darwin.go b/manager/allocator/cnmallocator/drivers_darwin.go index 1767ee0f1c..e7d3dbe710 100644 --- a/manager/allocator/cnmallocator/drivers_darwin.go +++ b/manager/allocator/cnmallocator/drivers_darwin.go @@ -3,7 +3,7 @@ package cnmallocator import ( "github.com/docker/docker/libnetwork/drivers/overlay/ovmanager" "github.com/docker/docker/libnetwork/drivers/remote" - "github.com/docker/swarmkit/manager/allocator/networkallocator" + "github.com/moby/swarmkit/v2/manager/allocator/networkallocator" ) var initializers = []initializer{ diff --git a/manager/allocator/cnmallocator/drivers_network_linux.go b/manager/allocator/cnmallocator/drivers_network_linux.go index 9d3b0e51cb..5ae9196977 100644 --- a/manager/allocator/cnmallocator/drivers_network_linux.go +++ b/manager/allocator/cnmallocator/drivers_network_linux.go @@ -7,7 +7,7 @@ import ( "github.com/docker/docker/libnetwork/drivers/macvlan/mvmanager" "github.com/docker/docker/libnetwork/drivers/overlay/ovmanager" "github.com/docker/docker/libnetwork/drivers/remote" - "github.com/docker/swarmkit/manager/allocator/networkallocator" + "github.com/moby/swarmkit/v2/manager/allocator/networkallocator" ) var initializers = []initializer{ diff --git a/manager/allocator/cnmallocator/drivers_network_windows.go b/manager/allocator/cnmallocator/drivers_network_windows.go index 1767ee0f1c..e7d3dbe710 100644 --- a/manager/allocator/cnmallocator/drivers_network_windows.go +++ b/manager/allocator/cnmallocator/drivers_network_windows.go @@ -3,7 +3,7 @@ package cnmallocator import ( "github.com/docker/docker/libnetwork/drivers/overlay/ovmanager" "github.com/docker/docker/libnetwork/drivers/remote" - "github.com/docker/swarmkit/manager/allocator/networkallocator" + "github.com/moby/swarmkit/v2/manager/allocator/networkallocator" ) var initializers = []initializer{ diff --git a/manager/allocator/cnmallocator/drivers_unsupported.go b/manager/allocator/cnmallocator/drivers_unsupported.go index 120971be52..2d1f17cb1f 100644 --- a/manager/allocator/cnmallocator/drivers_unsupported.go +++ b/manager/allocator/cnmallocator/drivers_unsupported.go @@ -4,7 +4,7 @@ package cnmallocator import ( - "github.com/docker/swarmkit/manager/allocator/networkallocator" + "github.com/moby/swarmkit/v2/manager/allocator/networkallocator" ) const initializers = nil diff --git a/manager/allocator/cnmallocator/networkallocator.go b/manager/allocator/cnmallocator/networkallocator.go index a21ba1cfa6..ad4dc03e1a 100644 --- a/manager/allocator/cnmallocator/networkallocator.go +++ b/manager/allocator/cnmallocator/networkallocator.go @@ -12,9 +12,9 @@ import ( "github.com/docker/docker/libnetwork/ipamapi" "github.com/docker/docker/libnetwork/netlabel" "github.com/docker/docker/pkg/plugingetter" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/log" - "github.com/docker/swarmkit/manager/allocator/networkallocator" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/log" + "github.com/moby/swarmkit/v2/manager/allocator/networkallocator" "github.com/pkg/errors" "github.com/sirupsen/logrus" ) diff --git a/manager/allocator/cnmallocator/networkallocator_test.go b/manager/allocator/cnmallocator/networkallocator_test.go index 8984b769db..003e591a46 100644 --- a/manager/allocator/cnmallocator/networkallocator_test.go +++ b/manager/allocator/cnmallocator/networkallocator_test.go @@ -7,8 +7,8 @@ import ( "github.com/docker/docker/libnetwork/discoverapi" "github.com/docker/docker/libnetwork/types" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/manager/allocator/networkallocator" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/manager/allocator/networkallocator" "github.com/stretchr/testify/assert" ) diff --git a/manager/allocator/cnmallocator/portallocator.go b/manager/allocator/cnmallocator/portallocator.go index f5e4b60bd1..303ac13b6b 100644 --- a/manager/allocator/cnmallocator/portallocator.go +++ b/manager/allocator/cnmallocator/portallocator.go @@ -4,7 +4,7 @@ import ( "fmt" "github.com/docker/docker/libnetwork/idm" - "github.com/docker/swarmkit/api" + "github.com/moby/swarmkit/v2/api" ) const ( diff --git a/manager/allocator/cnmallocator/portallocator_test.go b/manager/allocator/cnmallocator/portallocator_test.go index f894023c62..cbda0a3a50 100644 --- a/manager/allocator/cnmallocator/portallocator_test.go +++ b/manager/allocator/cnmallocator/portallocator_test.go @@ -3,7 +3,7 @@ package cnmallocator import ( "testing" - "github.com/docker/swarmkit/api" + "github.com/moby/swarmkit/v2/api" "github.com/stretchr/testify/assert" ) diff --git a/manager/allocator/network.go b/manager/allocator/network.go index fee3bf1d44..d39f8627d9 100644 --- a/manager/allocator/network.go +++ b/manager/allocator/network.go @@ -6,13 +6,13 @@ import ( "time" "github.com/docker/go-events" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/log" - "github.com/docker/swarmkit/manager/allocator/cnmallocator" - "github.com/docker/swarmkit/manager/allocator/networkallocator" - "github.com/docker/swarmkit/manager/state" - "github.com/docker/swarmkit/manager/state/store" - "github.com/docker/swarmkit/protobuf/ptypes" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/log" + "github.com/moby/swarmkit/v2/manager/allocator/cnmallocator" + "github.com/moby/swarmkit/v2/manager/allocator/networkallocator" + "github.com/moby/swarmkit/v2/manager/state" + "github.com/moby/swarmkit/v2/manager/state/store" + "github.com/moby/swarmkit/v2/protobuf/ptypes" "github.com/pkg/errors" ) diff --git a/manager/allocator/network_test.go b/manager/allocator/network_test.go index 0522cc6c0a..e768de2410 100644 --- a/manager/allocator/network_test.go +++ b/manager/allocator/network_test.go @@ -3,7 +3,7 @@ package allocator import ( "testing" - "github.com/docker/swarmkit/api" + "github.com/moby/swarmkit/v2/api" "github.com/stretchr/testify/assert" ) diff --git a/manager/allocator/networkallocator/networkallocator.go b/manager/allocator/networkallocator/networkallocator.go index f6b69b4d81..bb7085ce00 100644 --- a/manager/allocator/networkallocator/networkallocator.go +++ b/manager/allocator/networkallocator/networkallocator.go @@ -1,7 +1,7 @@ package networkallocator import ( - "github.com/docker/swarmkit/api" + "github.com/moby/swarmkit/v2/api" ) const ( diff --git a/manager/constraint/constraint.go b/manager/constraint/constraint.go index 6c49c07728..c523b47f02 100644 --- a/manager/constraint/constraint.go +++ b/manager/constraint/constraint.go @@ -6,7 +6,7 @@ import ( "regexp" "strings" - "github.com/docker/swarmkit/api" + "github.com/moby/swarmkit/v2/api" ) const ( diff --git a/manager/controlapi/ca_rotation.go b/manager/controlapi/ca_rotation.go index 91869a8d0a..7e95ee2b23 100644 --- a/manager/controlapi/ca_rotation.go +++ b/manager/controlapi/ca_rotation.go @@ -11,9 +11,9 @@ import ( "time" "github.com/cloudflare/cfssl/helpers" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/ca" - "github.com/docker/swarmkit/log" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/ca" + "github.com/moby/swarmkit/v2/log" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/manager/controlapi/ca_rotation_test.go b/manager/controlapi/ca_rotation_test.go index cd21c657d2..0a8b0705e1 100644 --- a/manager/controlapi/ca_rotation_test.go +++ b/manager/controlapi/ca_rotation_test.go @@ -10,9 +10,9 @@ import ( "github.com/cloudflare/cfssl/helpers" "github.com/cloudflare/cfssl/initca" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/ca" - "github.com/docker/swarmkit/ca/testutils" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/ca" + "github.com/moby/swarmkit/v2/ca/testutils" "github.com/stretchr/testify/require" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" diff --git a/manager/controlapi/cluster.go b/manager/controlapi/cluster.go index 73915f3eae..b9e561937a 100644 --- a/manager/controlapi/cluster.go +++ b/manager/controlapi/cluster.go @@ -5,11 +5,11 @@ import ( "strings" "time" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/ca" - "github.com/docker/swarmkit/log" - "github.com/docker/swarmkit/manager/encryption" - "github.com/docker/swarmkit/manager/state/store" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/ca" + "github.com/moby/swarmkit/v2/log" + "github.com/moby/swarmkit/v2/manager/encryption" + "github.com/moby/swarmkit/v2/manager/state/store" gogotypes "github.com/gogo/protobuf/types" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" diff --git a/manager/controlapi/cluster_test.go b/manager/controlapi/cluster_test.go index 346b057fd1..4318ebc2f1 100644 --- a/manager/controlapi/cluster_test.go +++ b/manager/controlapi/cluster_test.go @@ -6,12 +6,12 @@ import ( "testing" "time" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/ca" - "github.com/docker/swarmkit/ca/testutils" - "github.com/docker/swarmkit/manager/state/store" - "github.com/docker/swarmkit/protobuf/ptypes" - grpcutils "github.com/docker/swarmkit/testutils" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/ca" + "github.com/moby/swarmkit/v2/ca/testutils" + "github.com/moby/swarmkit/v2/manager/state/store" + "github.com/moby/swarmkit/v2/protobuf/ptypes" + grpcutils "github.com/moby/swarmkit/v2/testutils" gogotypes "github.com/gogo/protobuf/types" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/manager/controlapi/common.go b/manager/controlapi/common.go index 6a4b92add4..4a0102423a 100644 --- a/manager/controlapi/common.go +++ b/manager/controlapi/common.go @@ -7,9 +7,9 @@ import ( "github.com/docker/docker/libnetwork/driverapi" "github.com/docker/docker/libnetwork/ipamapi" "github.com/docker/docker/pkg/plugingetter" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/manager/allocator" - "github.com/docker/swarmkit/manager/state/store" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/manager/allocator" + "github.com/moby/swarmkit/v2/manager/state/store" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/manager/controlapi/common_test.go b/manager/controlapi/common_test.go index af36a2fd05..153dc52ab0 100644 --- a/manager/controlapi/common_test.go +++ b/manager/controlapi/common_test.go @@ -3,8 +3,8 @@ package controlapi import ( "testing" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/testutils" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/testutils" "github.com/stretchr/testify/assert" "google.golang.org/grpc/codes" ) diff --git a/manager/controlapi/config.go b/manager/controlapi/config.go index c7ec392240..be7463f441 100644 --- a/manager/controlapi/config.go +++ b/manager/controlapi/config.go @@ -5,10 +5,10 @@ import ( "context" "strings" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/identity" - "github.com/docker/swarmkit/log" - "github.com/docker/swarmkit/manager/state/store" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/identity" + "github.com/moby/swarmkit/v2/log" + "github.com/moby/swarmkit/v2/manager/state/store" "github.com/sirupsen/logrus" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" diff --git a/manager/controlapi/config_test.go b/manager/controlapi/config_test.go index 2d2de5f66c..148d7d2763 100644 --- a/manager/controlapi/config_test.go +++ b/manager/controlapi/config_test.go @@ -6,9 +6,9 @@ import ( "strings" "testing" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/manager/state/store" - "github.com/docker/swarmkit/testutils" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/manager/state/store" + "github.com/moby/swarmkit/v2/testutils" "github.com/stretchr/testify/assert" "google.golang.org/grpc/codes" ) diff --git a/manager/controlapi/extension.go b/manager/controlapi/extension.go index 321ec762d3..dbe3a5a9ce 100644 --- a/manager/controlapi/extension.go +++ b/manager/controlapi/extension.go @@ -4,10 +4,10 @@ import ( "context" "strings" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/identity" - "github.com/docker/swarmkit/log" - "github.com/docker/swarmkit/manager/state/store" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/identity" + "github.com/moby/swarmkit/v2/log" + "github.com/moby/swarmkit/v2/manager/state/store" "github.com/sirupsen/logrus" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" diff --git a/manager/controlapi/extension_test.go b/manager/controlapi/extension_test.go index 794d7c0b01..7da1a8e41d 100644 --- a/manager/controlapi/extension_test.go +++ b/manager/controlapi/extension_test.go @@ -7,9 +7,9 @@ import ( "github.com/stretchr/testify/assert" "google.golang.org/grpc/codes" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/manager/state/store" - "github.com/docker/swarmkit/testutils" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/manager/state/store" + "github.com/moby/swarmkit/v2/testutils" ) func TestCreateExtension(t *testing.T) { diff --git a/manager/controlapi/network.go b/manager/controlapi/network.go index ccb885d010..6de67e3a7c 100644 --- a/manager/controlapi/network.go +++ b/manager/controlapi/network.go @@ -7,11 +7,11 @@ import ( "github.com/docker/docker/libnetwork/driverapi" "github.com/docker/docker/libnetwork/ipamapi" "github.com/docker/docker/pkg/plugingetter" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/identity" - "github.com/docker/swarmkit/manager/allocator" - "github.com/docker/swarmkit/manager/allocator/networkallocator" - "github.com/docker/swarmkit/manager/state/store" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/identity" + "github.com/moby/swarmkit/v2/manager/allocator" + "github.com/moby/swarmkit/v2/manager/allocator/networkallocator" + "github.com/moby/swarmkit/v2/manager/state/store" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/manager/controlapi/network_test.go b/manager/controlapi/network_test.go index a8e6826134..2678756645 100644 --- a/manager/controlapi/network_test.go +++ b/manager/controlapi/network_test.go @@ -4,13 +4,13 @@ import ( "context" "testing" - "github.com/docker/swarmkit/testutils" + "github.com/moby/swarmkit/v2/testutils" "google.golang.org/grpc/codes" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/identity" - "github.com/docker/swarmkit/manager/state/store" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/identity" + "github.com/moby/swarmkit/v2/manager/state/store" "github.com/stretchr/testify/assert" ) diff --git a/manager/controlapi/node.go b/manager/controlapi/node.go index 6e8bdba5bd..0ffa6e146d 100644 --- a/manager/controlapi/node.go +++ b/manager/controlapi/node.go @@ -5,9 +5,9 @@ import ( "crypto/x509" "encoding/pem" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/manager/state/raft/membership" - "github.com/docker/swarmkit/manager/state/store" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/manager/state/raft/membership" + "github.com/moby/swarmkit/v2/manager/state/store" gogotypes "github.com/gogo/protobuf/types" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" diff --git a/manager/controlapi/node_test.go b/manager/controlapi/node_test.go index 186750cf62..489e4b9cb6 100644 --- a/manager/controlapi/node_test.go +++ b/manager/controlapi/node_test.go @@ -6,12 +6,12 @@ import ( "io" "testing" - "github.com/docker/swarmkit/api" - cautils "github.com/docker/swarmkit/ca/testutils" - "github.com/docker/swarmkit/identity" - raftutils "github.com/docker/swarmkit/manager/state/raft/testutils" - "github.com/docker/swarmkit/manager/state/store" - "github.com/docker/swarmkit/testutils" + "github.com/moby/swarmkit/v2/api" + cautils "github.com/moby/swarmkit/v2/ca/testutils" + "github.com/moby/swarmkit/v2/identity" + raftutils "github.com/moby/swarmkit/v2/manager/state/raft/testutils" + "github.com/moby/swarmkit/v2/manager/state/store" + "github.com/moby/swarmkit/v2/testutils" "github.com/sirupsen/logrus" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/manager/controlapi/resource.go b/manager/controlapi/resource.go index 8ae5cb1375..618285343a 100644 --- a/manager/controlapi/resource.go +++ b/manager/controlapi/resource.go @@ -7,10 +7,10 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/identity" - "github.com/docker/swarmkit/log" - "github.com/docker/swarmkit/manager/state/store" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/identity" + "github.com/moby/swarmkit/v2/log" + "github.com/moby/swarmkit/v2/manager/state/store" ) // CreateResource returns a `CreateResourceResponse` after creating a `Resource` based diff --git a/manager/controlapi/resource_test.go b/manager/controlapi/resource_test.go index cfbc4f39a6..0ea74f08ae 100644 --- a/manager/controlapi/resource_test.go +++ b/manager/controlapi/resource_test.go @@ -10,9 +10,9 @@ import ( "github.com/stretchr/testify/require" "google.golang.org/grpc/codes" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/manager/state/store" - "github.com/docker/swarmkit/testutils" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/manager/state/store" + "github.com/moby/swarmkit/v2/testutils" ) const testExtName = "testExtension" diff --git a/manager/controlapi/secret.go b/manager/controlapi/secret.go index f3d87d1a7c..b7dbf80c48 100644 --- a/manager/controlapi/secret.go +++ b/manager/controlapi/secret.go @@ -5,11 +5,11 @@ import ( "crypto/subtle" "strings" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/api/validation" - "github.com/docker/swarmkit/identity" - "github.com/docker/swarmkit/log" - "github.com/docker/swarmkit/manager/state/store" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/api/validation" + "github.com/moby/swarmkit/v2/identity" + "github.com/moby/swarmkit/v2/log" + "github.com/moby/swarmkit/v2/manager/state/store" "github.com/sirupsen/logrus" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" diff --git a/manager/controlapi/secret_test.go b/manager/controlapi/secret_test.go index b473318a81..12d927fe33 100644 --- a/manager/controlapi/secret_test.go +++ b/manager/controlapi/secret_test.go @@ -6,9 +6,9 @@ import ( "strings" "testing" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/manager/state/store" - "github.com/docker/swarmkit/testutils" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/manager/state/store" + "github.com/moby/swarmkit/v2/testutils" "github.com/stretchr/testify/assert" "google.golang.org/grpc/codes" ) diff --git a/manager/controlapi/server.go b/manager/controlapi/server.go index c16e229175..75bd0a4be3 100644 --- a/manager/controlapi/server.go +++ b/manager/controlapi/server.go @@ -4,10 +4,10 @@ import ( "errors" "github.com/docker/docker/pkg/plugingetter" - "github.com/docker/swarmkit/ca" - "github.com/docker/swarmkit/manager/drivers" - "github.com/docker/swarmkit/manager/state/raft" - "github.com/docker/swarmkit/manager/state/store" + "github.com/moby/swarmkit/v2/ca" + "github.com/moby/swarmkit/v2/manager/drivers" + "github.com/moby/swarmkit/v2/manager/state/raft" + "github.com/moby/swarmkit/v2/manager/state/store" ) var ( diff --git a/manager/controlapi/server_test.go b/manager/controlapi/server_test.go index 5a23a4d7d4..0d0cd26c7e 100644 --- a/manager/controlapi/server_test.go +++ b/manager/controlapi/server_test.go @@ -9,11 +9,11 @@ import ( "google.golang.org/grpc" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/ca" - cautils "github.com/docker/swarmkit/ca/testutils" - "github.com/docker/swarmkit/manager/state/store" - stateutils "github.com/docker/swarmkit/manager/state/testutils" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/ca" + cautils "github.com/moby/swarmkit/v2/ca/testutils" + "github.com/moby/swarmkit/v2/manager/state/store" + stateutils "github.com/moby/swarmkit/v2/manager/state/testutils" "github.com/stretchr/testify/assert" ) diff --git a/manager/controlapi/service.go b/manager/controlapi/service.go index e4db20b17f..86339ef76e 100644 --- a/manager/controlapi/service.go +++ b/manager/controlapi/service.go @@ -8,16 +8,16 @@ import ( "time" "github.com/docker/distribution/reference" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/api/defaults" - "github.com/docker/swarmkit/api/genericresource" - "github.com/docker/swarmkit/api/naming" - "github.com/docker/swarmkit/identity" - "github.com/docker/swarmkit/manager/allocator" - "github.com/docker/swarmkit/manager/constraint" - "github.com/docker/swarmkit/manager/state/store" - "github.com/docker/swarmkit/protobuf/ptypes" - "github.com/docker/swarmkit/template" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/api/defaults" + "github.com/moby/swarmkit/v2/api/genericresource" + "github.com/moby/swarmkit/v2/api/naming" + "github.com/moby/swarmkit/v2/identity" + "github.com/moby/swarmkit/v2/manager/allocator" + "github.com/moby/swarmkit/v2/manager/constraint" + "github.com/moby/swarmkit/v2/manager/state/store" + "github.com/moby/swarmkit/v2/protobuf/ptypes" + "github.com/moby/swarmkit/v2/template" gogotypes "github.com/gogo/protobuf/types" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" diff --git a/manager/controlapi/service_test.go b/manager/controlapi/service_test.go index cf9a617c5b..0e4adeb2a1 100644 --- a/manager/controlapi/service_test.go +++ b/manager/controlapi/service_test.go @@ -8,10 +8,10 @@ import ( "testing" "time" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/identity" - "github.com/docker/swarmkit/manager/state/store" - "github.com/docker/swarmkit/testutils" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/identity" + "github.com/moby/swarmkit/v2/manager/state/store" + "github.com/moby/swarmkit/v2/testutils" gogotypes "github.com/gogo/protobuf/types" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/manager/controlapi/task.go b/manager/controlapi/task.go index 5f85f9a93c..00dcc3dcb0 100644 --- a/manager/controlapi/task.go +++ b/manager/controlapi/task.go @@ -3,10 +3,10 @@ package controlapi import ( "context" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/api/naming" - "github.com/docker/swarmkit/manager/orchestrator" - "github.com/docker/swarmkit/manager/state/store" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/api/naming" + "github.com/moby/swarmkit/v2/manager/orchestrator" + "github.com/moby/swarmkit/v2/manager/state/store" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/manager/controlapi/task_test.go b/manager/controlapi/task_test.go index 17fe5e01cd..894b533d26 100644 --- a/manager/controlapi/task_test.go +++ b/manager/controlapi/task_test.go @@ -5,12 +5,12 @@ import ( "strings" "testing" - "github.com/docker/swarmkit/testutils" + "github.com/moby/swarmkit/v2/testutils" "google.golang.org/grpc/codes" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/identity" - "github.com/docker/swarmkit/manager/state/store" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/identity" + "github.com/moby/swarmkit/v2/manager/state/store" "github.com/stretchr/testify/assert" ) diff --git a/manager/controlapi/volume.go b/manager/controlapi/volume.go index 157059a961..8b01eb5c5d 100644 --- a/manager/controlapi/volume.go +++ b/manager/controlapi/volume.go @@ -4,9 +4,9 @@ import ( "context" "strings" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/identity" - "github.com/docker/swarmkit/manager/state/store" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/identity" + "github.com/moby/swarmkit/v2/manager/state/store" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/manager/controlapi/volume_test.go b/manager/controlapi/volume_test.go index bcf986cab7..d6a9c1c740 100644 --- a/manager/controlapi/volume_test.go +++ b/manager/controlapi/volume_test.go @@ -9,9 +9,9 @@ import ( "github.com/stretchr/testify/require" "google.golang.org/grpc/codes" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/manager/state/store" - "github.com/docker/swarmkit/testutils" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/manager/state/store" + "github.com/moby/swarmkit/v2/testutils" ) const testVolumeDriver = "somedriver" diff --git a/manager/csi/convert.go b/manager/csi/convert.go index 9df459f567..add7dae3e3 100644 --- a/manager/csi/convert.go +++ b/manager/csi/convert.go @@ -2,7 +2,7 @@ package csi import ( "github.com/container-storage-interface/spec/lib/go/csi" - "github.com/docker/swarmkit/api" + "github.com/moby/swarmkit/v2/api" ) // convert.go contains functions for converting swarm objects into CSI requests diff --git a/manager/csi/fakes_test.go b/manager/csi/fakes_test.go index 82f16bc424..254c8ba0c4 100644 --- a/manager/csi/fakes_test.go +++ b/manager/csi/fakes_test.go @@ -11,7 +11,7 @@ import ( "google.golang.org/grpc" "github.com/docker/docker/pkg/plugingetter" - "github.com/docker/swarmkit/api" + "github.com/moby/swarmkit/v2/api" ) const ( diff --git a/manager/csi/manager.go b/manager/csi/manager.go index 509194ef7b..dc9862fc4f 100644 --- a/manager/csi/manager.go +++ b/manager/csi/manager.go @@ -11,10 +11,10 @@ import ( "github.com/docker/docker/pkg/plugingetter" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/log" - "github.com/docker/swarmkit/manager/state/store" - "github.com/docker/swarmkit/volumequeue" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/log" + "github.com/moby/swarmkit/v2/manager/state/store" + "github.com/moby/swarmkit/v2/volumequeue" ) const ( diff --git a/manager/csi/manager_test.go b/manager/csi/manager_test.go index ece88cf029..cb8cf9dad3 100644 --- a/manager/csi/manager_test.go +++ b/manager/csi/manager_test.go @@ -10,9 +10,9 @@ import ( "github.com/docker/go-events" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/manager/state/store" - "github.com/docker/swarmkit/testutils" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/manager/state/store" + "github.com/moby/swarmkit/v2/testutils" ) var _ = Describe("Manager", func() { diff --git a/manager/csi/plugin.go b/manager/csi/plugin.go index 6a52daa1ee..4fcb75c6d1 100644 --- a/manager/csi/plugin.go +++ b/manager/csi/plugin.go @@ -9,7 +9,7 @@ import ( "github.com/container-storage-interface/spec/lib/go/csi" "github.com/docker/docker/pkg/plugingetter" - "github.com/docker/swarmkit/api" + "github.com/moby/swarmkit/v2/api" ) // Plugin is the interface for a CSI controller plugin. diff --git a/manager/csi/plugin_test.go b/manager/csi/plugin_test.go index 83be0b39f8..155145898e 100644 --- a/manager/csi/plugin_test.go +++ b/manager/csi/plugin_test.go @@ -9,7 +9,7 @@ import ( // "google.golang.org/grpc" "github.com/container-storage-interface/spec/lib/go/csi" - "github.com/docker/swarmkit/api" + "github.com/moby/swarmkit/v2/api" ) // newPluginFromClients creates a new plugin using the provided CSI RPC diff --git a/manager/csi/secret.go b/manager/csi/secret.go index 7810f4ca15..46842d9782 100644 --- a/manager/csi/secret.go +++ b/manager/csi/secret.go @@ -1,8 +1,8 @@ package csi import ( - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/manager/state/store" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/manager/state/store" ) // SecretProvider is an interface for retrieving secrets to use with CSI calls. diff --git a/manager/deallocator/deallocator.go b/manager/deallocator/deallocator.go index 8144152dce..24557cd378 100644 --- a/manager/deallocator/deallocator.go +++ b/manager/deallocator/deallocator.go @@ -4,9 +4,9 @@ import ( "context" "github.com/docker/go-events" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/log" - "github.com/docker/swarmkit/manager/state/store" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/log" + "github.com/moby/swarmkit/v2/manager/state/store" ) // Deallocator waits for services to fully shutdown (ie no containers left) diff --git a/manager/deallocator/deallocator_test.go b/manager/deallocator/deallocator_test.go index 1703d993cb..a2ed082f72 100644 --- a/manager/deallocator/deallocator_test.go +++ b/manager/deallocator/deallocator_test.go @@ -6,8 +6,8 @@ import ( "testing" "time" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/manager/state/store" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/manager/state/store" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/manager/deks.go b/manager/deks.go index e556ff74ee..3249f61b55 100644 --- a/manager/deks.go +++ b/manager/deks.go @@ -5,9 +5,9 @@ import ( "encoding/base64" "fmt" - "github.com/docker/swarmkit/ca" - "github.com/docker/swarmkit/manager/encryption" - "github.com/docker/swarmkit/manager/state/raft" + "github.com/moby/swarmkit/v2/ca" + "github.com/moby/swarmkit/v2/manager/encryption" + "github.com/moby/swarmkit/v2/manager/state/raft" ) // This module contains the data structures and control flow to manage rotating the raft diff --git a/manager/deks_test.go b/manager/deks_test.go index 6c790c6d37..7e719532ab 100644 --- a/manager/deks_test.go +++ b/manager/deks_test.go @@ -7,9 +7,9 @@ import ( "os" "testing" - "github.com/docker/swarmkit/ca" - cautils "github.com/docker/swarmkit/ca/testutils" - "github.com/docker/swarmkit/manager/state/raft" + "github.com/moby/swarmkit/v2/ca" + cautils "github.com/moby/swarmkit/v2/ca/testutils" + "github.com/moby/swarmkit/v2/manager/state/raft" "github.com/pkg/errors" "github.com/stretchr/testify/require" ) diff --git a/manager/dirty.go b/manager/dirty.go index c989ec2c86..1e65513654 100644 --- a/manager/dirty.go +++ b/manager/dirty.go @@ -3,8 +3,8 @@ package manager import ( "reflect" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/manager/state/store" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/manager/state/store" ) // IsStateDirty returns true if any objects have been added to raft which make diff --git a/manager/dirty_test.go b/manager/dirty_test.go index 7b0ab129b4..f2f1a6a21b 100644 --- a/manager/dirty_test.go +++ b/manager/dirty_test.go @@ -5,11 +5,11 @@ import ( "os" "testing" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/ca" - "github.com/docker/swarmkit/ca/testutils" - "github.com/docker/swarmkit/manager/state" - "github.com/docker/swarmkit/manager/state/store" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/ca" + "github.com/moby/swarmkit/v2/ca/testutils" + "github.com/moby/swarmkit/v2/manager/state" + "github.com/moby/swarmkit/v2/manager/state/store" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/manager/dispatcher/assignments.go b/manager/dispatcher/assignments.go index bd0f29872b..d398fa34b5 100644 --- a/manager/dispatcher/assignments.go +++ b/manager/dispatcher/assignments.go @@ -3,12 +3,12 @@ package dispatcher import ( "fmt" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/api/equality" - "github.com/docker/swarmkit/api/validation" - "github.com/docker/swarmkit/identity" - "github.com/docker/swarmkit/manager/drivers" - "github.com/docker/swarmkit/manager/state/store" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/api/equality" + "github.com/moby/swarmkit/v2/api/validation" + "github.com/moby/swarmkit/v2/identity" + "github.com/moby/swarmkit/v2/manager/drivers" + "github.com/moby/swarmkit/v2/manager/state/store" "github.com/sirupsen/logrus" ) diff --git a/manager/dispatcher/assignments_test.go b/manager/dispatcher/assignments_test.go index 65d9259caf..7b65a0b7db 100644 --- a/manager/dispatcher/assignments_test.go +++ b/manager/dispatcher/assignments_test.go @@ -7,9 +7,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/manager/state/store" - "github.com/docker/swarmkit/manager/state/testutils" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/manager/state/store" + "github.com/moby/swarmkit/v2/manager/state/testutils" ) func TestAssignVolume(t *testing.T) { diff --git a/manager/dispatcher/dispatcher.go b/manager/dispatcher/dispatcher.go index af7d13b4a3..e9b30f29ba 100644 --- a/manager/dispatcher/dispatcher.go +++ b/manager/dispatcher/dispatcher.go @@ -10,15 +10,15 @@ import ( "github.com/docker/go-events" "github.com/docker/go-metrics" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/api/equality" - "github.com/docker/swarmkit/ca" - "github.com/docker/swarmkit/log" - "github.com/docker/swarmkit/manager/drivers" - "github.com/docker/swarmkit/manager/state/store" - "github.com/docker/swarmkit/protobuf/ptypes" - "github.com/docker/swarmkit/remotes" - "github.com/docker/swarmkit/watch" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/api/equality" + "github.com/moby/swarmkit/v2/ca" + "github.com/moby/swarmkit/v2/log" + "github.com/moby/swarmkit/v2/manager/drivers" + "github.com/moby/swarmkit/v2/manager/state/store" + "github.com/moby/swarmkit/v2/protobuf/ptypes" + "github.com/moby/swarmkit/v2/remotes" + "github.com/moby/swarmkit/v2/watch" gogotypes "github.com/gogo/protobuf/types" "github.com/pkg/errors" "github.com/sirupsen/logrus" diff --git a/manager/dispatcher/dispatcher_test.go b/manager/dispatcher/dispatcher_test.go index 94ec446160..552be3968a 100644 --- a/manager/dispatcher/dispatcher_test.go +++ b/manager/dispatcher/dispatcher_test.go @@ -21,13 +21,13 @@ import ( "github.com/docker/docker/pkg/plugingetter" "github.com/docker/docker/pkg/plugins" "github.com/docker/go-events" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/ca" - cautils "github.com/docker/swarmkit/ca/testutils" - "github.com/docker/swarmkit/identity" - "github.com/docker/swarmkit/manager/drivers" - "github.com/docker/swarmkit/manager/state/store" - "github.com/docker/swarmkit/testutils" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/ca" + cautils "github.com/moby/swarmkit/v2/ca/testutils" + "github.com/moby/swarmkit/v2/identity" + "github.com/moby/swarmkit/v2/manager/drivers" + "github.com/moby/swarmkit/v2/manager/state/store" + "github.com/moby/swarmkit/v2/testutils" digest "github.com/opencontainers/go-digest" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/manager/dispatcher/nodes.go b/manager/dispatcher/nodes.go index fae6dc5f82..0f531e9497 100644 --- a/manager/dispatcher/nodes.go +++ b/manager/dispatcher/nodes.go @@ -4,9 +4,9 @@ import ( "sync" "time" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/identity" - "github.com/docker/swarmkit/manager/dispatcher/heartbeat" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/identity" + "github.com/moby/swarmkit/v2/manager/dispatcher/heartbeat" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/manager/drivers/provider.go b/manager/drivers/provider.go index 97c36fe73d..899c54e1a7 100644 --- a/manager/drivers/provider.go +++ b/manager/drivers/provider.go @@ -4,7 +4,7 @@ import ( "fmt" "github.com/docker/docker/pkg/plugingetter" - "github.com/docker/swarmkit/api" + "github.com/moby/swarmkit/v2/api" ) // DriverProvider provides external drivers diff --git a/manager/drivers/secrets.go b/manager/drivers/secrets.go index 642d244690..ec221a4cb6 100644 --- a/manager/drivers/secrets.go +++ b/manager/drivers/secrets.go @@ -4,8 +4,8 @@ import ( "fmt" "github.com/docker/docker/pkg/plugingetter" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/api/naming" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/api/naming" ) const ( diff --git a/manager/encryption/encryption.go b/manager/encryption/encryption.go index 38ce091411..b458a84d46 100644 --- a/manager/encryption/encryption.go +++ b/manager/encryption/encryption.go @@ -7,7 +7,7 @@ import ( "io" "strings" - "github.com/docker/swarmkit/api" + "github.com/moby/swarmkit/v2/api" "github.com/gogo/protobuf/proto" "github.com/pkg/errors" ) diff --git a/manager/encryption/fernet.go b/manager/encryption/fernet.go index 09f418008a..fea08d2939 100644 --- a/manager/encryption/fernet.go +++ b/manager/encryption/fernet.go @@ -3,7 +3,7 @@ package encryption import ( "fmt" - "github.com/docker/swarmkit/api" + "github.com/moby/swarmkit/v2/api" "github.com/fernet/fernet-go" ) diff --git a/manager/encryption/fernet_test.go b/manager/encryption/fernet_test.go index be29a6e194..3cf951fda2 100644 --- a/manager/encryption/fernet_test.go +++ b/manager/encryption/fernet_test.go @@ -5,7 +5,7 @@ import ( "io" "testing" - "github.com/docker/swarmkit/api" + "github.com/moby/swarmkit/v2/api" "github.com/stretchr/testify/require" ) diff --git a/manager/encryption/nacl.go b/manager/encryption/nacl.go index 5fe6879f89..2928d1294a 100644 --- a/manager/encryption/nacl.go +++ b/manager/encryption/nacl.go @@ -5,7 +5,7 @@ import ( "fmt" "io" - "github.com/docker/swarmkit/api" + "github.com/moby/swarmkit/v2/api" "golang.org/x/crypto/nacl/secretbox" ) diff --git a/manager/encryption/nacl_test.go b/manager/encryption/nacl_test.go index 329046ed76..ee4d0b03d6 100644 --- a/manager/encryption/nacl_test.go +++ b/manager/encryption/nacl_test.go @@ -5,7 +5,7 @@ import ( "io" "testing" - "github.com/docker/swarmkit/api" + "github.com/moby/swarmkit/v2/api" "github.com/stretchr/testify/require" ) diff --git a/manager/health/health.go b/manager/health/health.go index d75cbf4b60..4fd2adc541 100644 --- a/manager/health/health.go +++ b/manager/health/health.go @@ -11,7 +11,7 @@ import ( "context" "sync" - "github.com/docker/swarmkit/api" + "github.com/moby/swarmkit/v2/api" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/manager/keymanager/keymanager.go b/manager/keymanager/keymanager.go index 7a5d7bf14d..cbbea32533 100644 --- a/manager/keymanager/keymanager.go +++ b/manager/keymanager/keymanager.go @@ -12,9 +12,9 @@ import ( "sync" "time" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/log" - "github.com/docker/swarmkit/manager/state/store" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/log" + "github.com/moby/swarmkit/v2/manager/state/store" "github.com/pkg/errors" ) diff --git a/manager/keymanager/keymanager_test.go b/manager/keymanager/keymanager_test.go index 6b91cbf0bd..c957d74f55 100644 --- a/manager/keymanager/keymanager_test.go +++ b/manager/keymanager/keymanager_test.go @@ -6,8 +6,8 @@ import ( "testing" "time" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/manager/state/store" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/manager/state/store" "github.com/stretchr/testify/assert" ) diff --git a/manager/logbroker/broker.go b/manager/logbroker/broker.go index c19438a27a..bce0cf152c 100644 --- a/manager/logbroker/broker.go +++ b/manager/logbroker/broker.go @@ -8,12 +8,12 @@ import ( "sync" "github.com/docker/go-events" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/ca" - "github.com/docker/swarmkit/identity" - "github.com/docker/swarmkit/log" - "github.com/docker/swarmkit/manager/state/store" - "github.com/docker/swarmkit/watch" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/ca" + "github.com/moby/swarmkit/v2/identity" + "github.com/moby/swarmkit/v2/log" + "github.com/moby/swarmkit/v2/manager/state/store" + "github.com/moby/swarmkit/v2/watch" "github.com/sirupsen/logrus" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" diff --git a/manager/logbroker/broker_test.go b/manager/logbroker/broker_test.go index 5ac1857e93..419fac1265 100644 --- a/manager/logbroker/broker_test.go +++ b/manager/logbroker/broker_test.go @@ -11,11 +11,11 @@ import ( "google.golang.org/grpc" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/ca" - "github.com/docker/swarmkit/ca/testutils" - "github.com/docker/swarmkit/manager/state/store" - "github.com/docker/swarmkit/protobuf/ptypes" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/ca" + "github.com/moby/swarmkit/v2/ca/testutils" + "github.com/moby/swarmkit/v2/manager/state/store" + "github.com/moby/swarmkit/v2/protobuf/ptypes" gogotypes "github.com/gogo/protobuf/types" "github.com/stretchr/testify/require" ) diff --git a/manager/logbroker/subscription.go b/manager/logbroker/subscription.go index 45295bb40a..7441ae50c6 100644 --- a/manager/logbroker/subscription.go +++ b/manager/logbroker/subscription.go @@ -7,11 +7,11 @@ import ( "sync" events "github.com/docker/go-events" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/log" - "github.com/docker/swarmkit/manager/state" - "github.com/docker/swarmkit/manager/state/store" - "github.com/docker/swarmkit/watch" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/log" + "github.com/moby/swarmkit/v2/manager/state" + "github.com/moby/swarmkit/v2/manager/state/store" + "github.com/moby/swarmkit/v2/watch" ) type subscription struct { diff --git a/manager/manager.go b/manager/manager.go index 59895b1399..4bf219d0e4 100644 --- a/manager/manager.go +++ b/manager/manager.go @@ -16,36 +16,36 @@ import ( "github.com/docker/docker/pkg/plugingetter" "github.com/docker/go-events" gmetrics "github.com/docker/go-metrics" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/ca" - "github.com/docker/swarmkit/connectionbroker" - "github.com/docker/swarmkit/identity" - "github.com/docker/swarmkit/log" - "github.com/docker/swarmkit/manager/allocator" - "github.com/docker/swarmkit/manager/allocator/cnmallocator" - "github.com/docker/swarmkit/manager/allocator/networkallocator" - "github.com/docker/swarmkit/manager/controlapi" - "github.com/docker/swarmkit/manager/csi" - "github.com/docker/swarmkit/manager/dispatcher" - "github.com/docker/swarmkit/manager/drivers" - "github.com/docker/swarmkit/manager/health" - "github.com/docker/swarmkit/manager/keymanager" - "github.com/docker/swarmkit/manager/logbroker" - "github.com/docker/swarmkit/manager/metrics" - "github.com/docker/swarmkit/manager/orchestrator/constraintenforcer" - "github.com/docker/swarmkit/manager/orchestrator/global" - "github.com/docker/swarmkit/manager/orchestrator/jobs" - "github.com/docker/swarmkit/manager/orchestrator/replicated" - "github.com/docker/swarmkit/manager/orchestrator/taskreaper" - "github.com/docker/swarmkit/manager/orchestrator/volumeenforcer" - "github.com/docker/swarmkit/manager/resourceapi" - "github.com/docker/swarmkit/manager/scheduler" - "github.com/docker/swarmkit/manager/state/raft" - "github.com/docker/swarmkit/manager/state/raft/transport" - "github.com/docker/swarmkit/manager/state/store" - "github.com/docker/swarmkit/manager/watchapi" - "github.com/docker/swarmkit/remotes" - "github.com/docker/swarmkit/xnet" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/ca" + "github.com/moby/swarmkit/v2/connectionbroker" + "github.com/moby/swarmkit/v2/identity" + "github.com/moby/swarmkit/v2/log" + "github.com/moby/swarmkit/v2/manager/allocator" + "github.com/moby/swarmkit/v2/manager/allocator/cnmallocator" + "github.com/moby/swarmkit/v2/manager/allocator/networkallocator" + "github.com/moby/swarmkit/v2/manager/controlapi" + "github.com/moby/swarmkit/v2/manager/csi" + "github.com/moby/swarmkit/v2/manager/dispatcher" + "github.com/moby/swarmkit/v2/manager/drivers" + "github.com/moby/swarmkit/v2/manager/health" + "github.com/moby/swarmkit/v2/manager/keymanager" + "github.com/moby/swarmkit/v2/manager/logbroker" + "github.com/moby/swarmkit/v2/manager/metrics" + "github.com/moby/swarmkit/v2/manager/orchestrator/constraintenforcer" + "github.com/moby/swarmkit/v2/manager/orchestrator/global" + "github.com/moby/swarmkit/v2/manager/orchestrator/jobs" + "github.com/moby/swarmkit/v2/manager/orchestrator/replicated" + "github.com/moby/swarmkit/v2/manager/orchestrator/taskreaper" + "github.com/moby/swarmkit/v2/manager/orchestrator/volumeenforcer" + "github.com/moby/swarmkit/v2/manager/resourceapi" + "github.com/moby/swarmkit/v2/manager/scheduler" + "github.com/moby/swarmkit/v2/manager/state/raft" + "github.com/moby/swarmkit/v2/manager/state/raft/transport" + "github.com/moby/swarmkit/v2/manager/state/store" + "github.com/moby/swarmkit/v2/manager/watchapi" + "github.com/moby/swarmkit/v2/remotes" + "github.com/moby/swarmkit/v2/xnet" gogotypes "github.com/gogo/protobuf/types" grpc_prometheus "github.com/grpc-ecosystem/go-grpc-prometheus" "github.com/pkg/errors" diff --git a/manager/manager_test.go b/manager/manager_test.go index 985407ad47..2679b2bef3 100644 --- a/manager/manager_test.go +++ b/manager/manager_test.go @@ -15,15 +15,15 @@ import ( "google.golang.org/grpc" "google.golang.org/grpc/credentials" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/ca" - "github.com/docker/swarmkit/ca/keyutils" - cautils "github.com/docker/swarmkit/ca/testutils" - "github.com/docker/swarmkit/manager/dispatcher" - "github.com/docker/swarmkit/manager/encryption" - "github.com/docker/swarmkit/manager/state/raft/storage" - "github.com/docker/swarmkit/manager/state/store" - "github.com/docker/swarmkit/testutils" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/ca" + "github.com/moby/swarmkit/v2/ca/keyutils" + cautils "github.com/moby/swarmkit/v2/ca/testutils" + "github.com/moby/swarmkit/v2/manager/dispatcher" + "github.com/moby/swarmkit/v2/manager/encryption" + "github.com/moby/swarmkit/v2/manager/state/raft/storage" + "github.com/moby/swarmkit/v2/manager/state/store" + "github.com/moby/swarmkit/v2/testutils" "github.com/stretchr/testify/require" ) diff --git a/manager/metrics/collector.go b/manager/metrics/collector.go index 5539a898ca..00e5690304 100644 --- a/manager/metrics/collector.go +++ b/manager/metrics/collector.go @@ -7,8 +7,8 @@ import ( "github.com/docker/go-events" metrics "github.com/docker/go-metrics" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/manager/state/store" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/manager/state/store" ) var ( diff --git a/manager/orchestrator/constraintenforcer/constraint_enforcer.go b/manager/orchestrator/constraintenforcer/constraint_enforcer.go index 6b179de3f7..5faae5a025 100644 --- a/manager/orchestrator/constraintenforcer/constraint_enforcer.go +++ b/manager/orchestrator/constraintenforcer/constraint_enforcer.go @@ -3,13 +3,13 @@ package constraintenforcer import ( "time" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/api/genericresource" - "github.com/docker/swarmkit/log" - "github.com/docker/swarmkit/manager/constraint" - "github.com/docker/swarmkit/manager/state" - "github.com/docker/swarmkit/manager/state/store" - "github.com/docker/swarmkit/protobuf/ptypes" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/api/genericresource" + "github.com/moby/swarmkit/v2/log" + "github.com/moby/swarmkit/v2/manager/constraint" + "github.com/moby/swarmkit/v2/manager/state" + "github.com/moby/swarmkit/v2/manager/state/store" + "github.com/moby/swarmkit/v2/protobuf/ptypes" ) // ConstraintEnforcer watches for updates to nodes and shuts down tasks that no diff --git a/manager/orchestrator/constraintenforcer/constraint_enforcer_test.go b/manager/orchestrator/constraintenforcer/constraint_enforcer_test.go index 3e855cc068..e9c39a6800 100644 --- a/manager/orchestrator/constraintenforcer/constraint_enforcer_test.go +++ b/manager/orchestrator/constraintenforcer/constraint_enforcer_test.go @@ -3,10 +3,10 @@ package constraintenforcer import ( "testing" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/manager/orchestrator/testutils" - "github.com/docker/swarmkit/manager/state" - "github.com/docker/swarmkit/manager/state/store" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/manager/orchestrator/testutils" + "github.com/moby/swarmkit/v2/manager/state" + "github.com/moby/swarmkit/v2/manager/state/store" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/manager/orchestrator/global/global.go b/manager/orchestrator/global/global.go index 715781e817..71c5bae13f 100644 --- a/manager/orchestrator/global/global.go +++ b/manager/orchestrator/global/global.go @@ -3,14 +3,14 @@ package global import ( "context" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/log" - "github.com/docker/swarmkit/manager/constraint" - "github.com/docker/swarmkit/manager/orchestrator" - "github.com/docker/swarmkit/manager/orchestrator/restart" - "github.com/docker/swarmkit/manager/orchestrator/taskinit" - "github.com/docker/swarmkit/manager/orchestrator/update" - "github.com/docker/swarmkit/manager/state/store" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/log" + "github.com/moby/swarmkit/v2/manager/constraint" + "github.com/moby/swarmkit/v2/manager/orchestrator" + "github.com/moby/swarmkit/v2/manager/orchestrator/restart" + "github.com/moby/swarmkit/v2/manager/orchestrator/taskinit" + "github.com/moby/swarmkit/v2/manager/orchestrator/update" + "github.com/moby/swarmkit/v2/manager/state/store" ) type globalService struct { diff --git a/manager/orchestrator/global/global_test.go b/manager/orchestrator/global/global_test.go index abb24fc307..5aa6397da3 100644 --- a/manager/orchestrator/global/global_test.go +++ b/manager/orchestrator/global/global_test.go @@ -6,11 +6,11 @@ import ( "time" "github.com/docker/go-events" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/manager/orchestrator/testutils" - "github.com/docker/swarmkit/manager/state" - "github.com/docker/swarmkit/manager/state/store" - "github.com/docker/swarmkit/protobuf/ptypes" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/manager/orchestrator/testutils" + "github.com/moby/swarmkit/v2/manager/state" + "github.com/moby/swarmkit/v2/manager/state/store" + "github.com/moby/swarmkit/v2/protobuf/ptypes" gogotypes "github.com/gogo/protobuf/types" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/manager/orchestrator/jobs/fakes_test.go b/manager/orchestrator/jobs/fakes_test.go index a55f18790b..a2202248d5 100644 --- a/manager/orchestrator/jobs/fakes_test.go +++ b/manager/orchestrator/jobs/fakes_test.go @@ -5,11 +5,11 @@ import ( "sync" "time" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/manager/orchestrator" - "github.com/docker/swarmkit/manager/orchestrator/restart" - "github.com/docker/swarmkit/manager/orchestrator/taskinit" - "github.com/docker/swarmkit/manager/state/store" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/manager/orchestrator" + "github.com/moby/swarmkit/v2/manager/orchestrator/restart" + "github.com/moby/swarmkit/v2/manager/orchestrator/taskinit" + "github.com/moby/swarmkit/v2/manager/state/store" ) // fakes_test.go is just a file to hold all of the test fakes used with the diff --git a/manager/orchestrator/jobs/global/reconciler.go b/manager/orchestrator/jobs/global/reconciler.go index 00e95804c3..09e84b9f04 100644 --- a/manager/orchestrator/jobs/global/reconciler.go +++ b/manager/orchestrator/jobs/global/reconciler.go @@ -3,10 +3,10 @@ package global import ( "context" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/manager/constraint" - "github.com/docker/swarmkit/manager/orchestrator" - "github.com/docker/swarmkit/manager/state/store" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/manager/constraint" + "github.com/moby/swarmkit/v2/manager/orchestrator" + "github.com/moby/swarmkit/v2/manager/state/store" ) // restartSupervisor is an interface representing the methods from the diff --git a/manager/orchestrator/jobs/global/reconciler_test.go b/manager/orchestrator/jobs/global/reconciler_test.go index 5b3d952178..1c9cf4641d 100644 --- a/manager/orchestrator/jobs/global/reconciler_test.go +++ b/manager/orchestrator/jobs/global/reconciler_test.go @@ -6,9 +6,9 @@ import ( "context" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/manager/orchestrator" - "github.com/docker/swarmkit/manager/state/store" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/manager/orchestrator" + "github.com/moby/swarmkit/v2/manager/state/store" ) type fakeRestartSupervisor struct { diff --git a/manager/orchestrator/jobs/orchestrator.go b/manager/orchestrator/jobs/orchestrator.go index d244d3c65b..5bf366e53d 100644 --- a/manager/orchestrator/jobs/orchestrator.go +++ b/manager/orchestrator/jobs/orchestrator.go @@ -6,14 +6,14 @@ import ( "github.com/docker/go-events" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/log" - "github.com/docker/swarmkit/manager/orchestrator" - "github.com/docker/swarmkit/manager/orchestrator/jobs/global" - "github.com/docker/swarmkit/manager/orchestrator/jobs/replicated" - "github.com/docker/swarmkit/manager/orchestrator/restart" - "github.com/docker/swarmkit/manager/orchestrator/taskinit" - "github.com/docker/swarmkit/manager/state/store" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/log" + "github.com/moby/swarmkit/v2/manager/orchestrator" + "github.com/moby/swarmkit/v2/manager/orchestrator/jobs/global" + "github.com/moby/swarmkit/v2/manager/orchestrator/jobs/replicated" + "github.com/moby/swarmkit/v2/manager/orchestrator/restart" + "github.com/moby/swarmkit/v2/manager/orchestrator/taskinit" + "github.com/moby/swarmkit/v2/manager/state/store" ) // Reconciler is the type that holds the reconciliation logic for the diff --git a/manager/orchestrator/jobs/orchestrator_controlapi_integration_test.go b/manager/orchestrator/jobs/orchestrator_controlapi_integration_test.go index 48a92596f6..396deac830 100644 --- a/manager/orchestrator/jobs/orchestrator_controlapi_integration_test.go +++ b/manager/orchestrator/jobs/orchestrator_controlapi_integration_test.go @@ -11,11 +11,11 @@ import ( "google.golang.org/grpc" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/manager/controlapi" - "github.com/docker/swarmkit/manager/orchestrator/testutils" - "github.com/docker/swarmkit/manager/state/store" - stateutils "github.com/docker/swarmkit/manager/state/testutils" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/manager/controlapi" + "github.com/moby/swarmkit/v2/manager/orchestrator/testutils" + "github.com/moby/swarmkit/v2/manager/state/store" + stateutils "github.com/moby/swarmkit/v2/manager/state/testutils" ) var _ = Describe("Integration between the controlapi and jobs orchestrator", func() { diff --git a/manager/orchestrator/jobs/orchestrator_restart_test.go b/manager/orchestrator/jobs/orchestrator_restart_test.go index c6a1c87a6a..f04b6c004f 100644 --- a/manager/orchestrator/jobs/orchestrator_restart_test.go +++ b/manager/orchestrator/jobs/orchestrator_restart_test.go @@ -11,8 +11,8 @@ import ( "github.com/docker/go-events" gogotypes "github.com/gogo/protobuf/types" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/manager/state/store" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/manager/state/store" ) // passEventsUntil is a helper method that calls handleEvent on all events from diff --git a/manager/orchestrator/jobs/orchestrator_test.go b/manager/orchestrator/jobs/orchestrator_test.go index 6f1c999557..3981289c6f 100644 --- a/manager/orchestrator/jobs/orchestrator_test.go +++ b/manager/orchestrator/jobs/orchestrator_test.go @@ -7,9 +7,9 @@ import ( "context" "fmt" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/manager/orchestrator/testutils" - "github.com/docker/swarmkit/manager/state/store" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/manager/orchestrator/testutils" + "github.com/moby/swarmkit/v2/manager/state/store" ) var _ = Describe("Replicated job orchestrator", func() { diff --git a/manager/orchestrator/jobs/replicated/reconciler.go b/manager/orchestrator/jobs/replicated/reconciler.go index 886ac8d91e..949bbff0dc 100644 --- a/manager/orchestrator/jobs/replicated/reconciler.go +++ b/manager/orchestrator/jobs/replicated/reconciler.go @@ -4,9 +4,9 @@ import ( "context" "fmt" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/manager/orchestrator" - "github.com/docker/swarmkit/manager/state/store" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/manager/orchestrator" + "github.com/moby/swarmkit/v2/manager/state/store" ) // restartSupervisor is an interface representing the methods from the diff --git a/manager/orchestrator/jobs/replicated/reconciler_test.go b/manager/orchestrator/jobs/replicated/reconciler_test.go index be73e3c920..25a2e891f8 100644 --- a/manager/orchestrator/jobs/replicated/reconciler_test.go +++ b/manager/orchestrator/jobs/replicated/reconciler_test.go @@ -8,9 +8,9 @@ import ( "context" "fmt" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/manager/orchestrator" - "github.com/docker/swarmkit/manager/state/store" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/manager/orchestrator" + "github.com/moby/swarmkit/v2/manager/state/store" ) type fakeRestartSupervisor struct { diff --git a/manager/orchestrator/replicated/drain_test.go b/manager/orchestrator/replicated/drain_test.go index 690cc09aa8..1e185b8260 100644 --- a/manager/orchestrator/replicated/drain_test.go +++ b/manager/orchestrator/replicated/drain_test.go @@ -4,10 +4,10 @@ import ( "context" "testing" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/manager/orchestrator/testutils" - "github.com/docker/swarmkit/manager/state" - "github.com/docker/swarmkit/manager/state/store" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/manager/orchestrator/testutils" + "github.com/moby/swarmkit/v2/manager/state" + "github.com/moby/swarmkit/v2/manager/state/store" "github.com/stretchr/testify/assert" ) diff --git a/manager/orchestrator/replicated/replicated.go b/manager/orchestrator/replicated/replicated.go index dc45528682..e3eb2574ac 100644 --- a/manager/orchestrator/replicated/replicated.go +++ b/manager/orchestrator/replicated/replicated.go @@ -3,11 +3,11 @@ package replicated import ( "context" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/manager/orchestrator/restart" - "github.com/docker/swarmkit/manager/orchestrator/update" - "github.com/docker/swarmkit/manager/state" - "github.com/docker/swarmkit/manager/state/store" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/manager/orchestrator/restart" + "github.com/moby/swarmkit/v2/manager/orchestrator/update" + "github.com/moby/swarmkit/v2/manager/state" + "github.com/moby/swarmkit/v2/manager/state/store" ) // An Orchestrator runs a reconciliation loop to create and destroy diff --git a/manager/orchestrator/replicated/replicated_test.go b/manager/orchestrator/replicated/replicated_test.go index 6484b0ba50..25f5dbb47f 100644 --- a/manager/orchestrator/replicated/replicated_test.go +++ b/manager/orchestrator/replicated/replicated_test.go @@ -5,11 +5,11 @@ import ( "testing" "time" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/manager/orchestrator/testutils" - "github.com/docker/swarmkit/manager/state" - "github.com/docker/swarmkit/manager/state/store" - "github.com/docker/swarmkit/protobuf/ptypes" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/manager/orchestrator/testutils" + "github.com/moby/swarmkit/v2/manager/state" + "github.com/moby/swarmkit/v2/manager/state/store" + "github.com/moby/swarmkit/v2/protobuf/ptypes" gogotypes "github.com/gogo/protobuf/types" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/manager/orchestrator/replicated/restart_test.go b/manager/orchestrator/replicated/restart_test.go index 2105b84a95..2330987577 100644 --- a/manager/orchestrator/replicated/restart_test.go +++ b/manager/orchestrator/replicated/restart_test.go @@ -5,11 +5,11 @@ import ( "testing" "time" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/manager/orchestrator/testutils" - "github.com/docker/swarmkit/manager/state" - "github.com/docker/swarmkit/manager/state/store" - "github.com/docker/swarmkit/protobuf/ptypes" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/manager/orchestrator/testutils" + "github.com/moby/swarmkit/v2/manager/state" + "github.com/moby/swarmkit/v2/manager/state/store" + "github.com/moby/swarmkit/v2/protobuf/ptypes" gogotypes "github.com/gogo/protobuf/types" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/manager/orchestrator/replicated/services.go b/manager/orchestrator/replicated/services.go index b5e6bb12e8..fa4463b276 100644 --- a/manager/orchestrator/replicated/services.go +++ b/manager/orchestrator/replicated/services.go @@ -5,10 +5,10 @@ import ( "sort" "github.com/docker/go-events" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/log" - "github.com/docker/swarmkit/manager/orchestrator" - "github.com/docker/swarmkit/manager/state/store" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/log" + "github.com/moby/swarmkit/v2/manager/orchestrator" + "github.com/moby/swarmkit/v2/manager/state/store" ) // This file provices service-level orchestration. It observes changes to diff --git a/manager/orchestrator/replicated/slot.go b/manager/orchestrator/replicated/slot.go index 1160d4c96c..0009505cc7 100644 --- a/manager/orchestrator/replicated/slot.go +++ b/manager/orchestrator/replicated/slot.go @@ -3,9 +3,9 @@ package replicated import ( "context" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/manager/orchestrator" - "github.com/docker/swarmkit/manager/state/store" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/manager/orchestrator" + "github.com/moby/swarmkit/v2/manager/state/store" ) type slotsByRunningState []orchestrator.Slot diff --git a/manager/orchestrator/replicated/tasks.go b/manager/orchestrator/replicated/tasks.go index b6336aa88a..8f3d203170 100644 --- a/manager/orchestrator/replicated/tasks.go +++ b/manager/orchestrator/replicated/tasks.go @@ -4,11 +4,11 @@ import ( "context" "github.com/docker/go-events" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/log" - "github.com/docker/swarmkit/manager/orchestrator" - "github.com/docker/swarmkit/manager/orchestrator/taskinit" - "github.com/docker/swarmkit/manager/state/store" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/log" + "github.com/moby/swarmkit/v2/manager/orchestrator" + "github.com/moby/swarmkit/v2/manager/orchestrator/taskinit" + "github.com/moby/swarmkit/v2/manager/state/store" ) // This file provides task-level orchestration. It observes changes to task diff --git a/manager/orchestrator/replicated/update_test.go b/manager/orchestrator/replicated/update_test.go index 53d6da728e..52708f7ebd 100644 --- a/manager/orchestrator/replicated/update_test.go +++ b/manager/orchestrator/replicated/update_test.go @@ -7,10 +7,10 @@ import ( "time" "github.com/docker/go-events" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/manager/orchestrator/testutils" - "github.com/docker/swarmkit/manager/state" - "github.com/docker/swarmkit/manager/state/store" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/manager/orchestrator/testutils" + "github.com/moby/swarmkit/v2/manager/state" + "github.com/moby/swarmkit/v2/manager/state/store" gogotypes "github.com/gogo/protobuf/types" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/manager/orchestrator/restart/restart.go b/manager/orchestrator/restart/restart.go index 44e1309f6c..d38a5bb33f 100644 --- a/manager/orchestrator/restart/restart.go +++ b/manager/orchestrator/restart/restart.go @@ -8,12 +8,12 @@ import ( "time" "github.com/docker/go-events" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/api/defaults" - "github.com/docker/swarmkit/log" - "github.com/docker/swarmkit/manager/orchestrator" - "github.com/docker/swarmkit/manager/state" - "github.com/docker/swarmkit/manager/state/store" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/api/defaults" + "github.com/moby/swarmkit/v2/log" + "github.com/moby/swarmkit/v2/manager/orchestrator" + "github.com/moby/swarmkit/v2/manager/state" + "github.com/moby/swarmkit/v2/manager/state/store" gogotypes "github.com/gogo/protobuf/types" ) diff --git a/manager/orchestrator/service.go b/manager/orchestrator/service.go index adc5181b50..476433e5d1 100644 --- a/manager/orchestrator/service.go +++ b/manager/orchestrator/service.go @@ -3,9 +3,9 @@ package orchestrator import ( "context" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/log" - "github.com/docker/swarmkit/manager/state/store" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/log" + "github.com/moby/swarmkit/v2/manager/state/store" ) // IsReplicatedService checks if a service is a replicated service. diff --git a/manager/orchestrator/service_test.go b/manager/orchestrator/service_test.go index c6d92dc792..e103436f6c 100644 --- a/manager/orchestrator/service_test.go +++ b/manager/orchestrator/service_test.go @@ -3,7 +3,7 @@ package orchestrator import ( "testing" - "github.com/docker/swarmkit/api" + "github.com/moby/swarmkit/v2/api" "github.com/stretchr/testify/assert" ) diff --git a/manager/orchestrator/slot.go b/manager/orchestrator/slot.go index 7839a7509c..f585fdf46d 100644 --- a/manager/orchestrator/slot.go +++ b/manager/orchestrator/slot.go @@ -1,7 +1,7 @@ package orchestrator import ( - "github.com/docker/swarmkit/api" + "github.com/moby/swarmkit/v2/api" ) // Slot is a list of the running tasks occupying a certain slot. Generally this diff --git a/manager/orchestrator/task.go b/manager/orchestrator/task.go index f9a3feadf5..0c0b54dcda 100644 --- a/manager/orchestrator/task.go +++ b/manager/orchestrator/task.go @@ -4,11 +4,11 @@ import ( "reflect" "time" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/api/defaults" - "github.com/docker/swarmkit/identity" - "github.com/docker/swarmkit/manager/constraint" - "github.com/docker/swarmkit/protobuf/ptypes" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/api/defaults" + "github.com/moby/swarmkit/v2/identity" + "github.com/moby/swarmkit/v2/manager/constraint" + "github.com/moby/swarmkit/v2/protobuf/ptypes" google_protobuf "github.com/gogo/protobuf/types" ) diff --git a/manager/orchestrator/task_test.go b/manager/orchestrator/task_test.go index ec7f379f7a..58b5918be0 100644 --- a/manager/orchestrator/task_test.go +++ b/manager/orchestrator/task_test.go @@ -8,7 +8,7 @@ import ( google_protobuf "github.com/gogo/protobuf/types" "github.com/stretchr/testify/assert" - "github.com/docker/swarmkit/api" + "github.com/moby/swarmkit/v2/api" ) // Test IsTaskDirty() for placement constraints. diff --git a/manager/orchestrator/taskinit/init.go b/manager/orchestrator/taskinit/init.go index 5636c3c699..5098d70a8a 100644 --- a/manager/orchestrator/taskinit/init.go +++ b/manager/orchestrator/taskinit/init.go @@ -5,12 +5,12 @@ import ( "sort" "time" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/api/defaults" - "github.com/docker/swarmkit/log" - "github.com/docker/swarmkit/manager/orchestrator" - "github.com/docker/swarmkit/manager/orchestrator/restart" - "github.com/docker/swarmkit/manager/state/store" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/api/defaults" + "github.com/moby/swarmkit/v2/log" + "github.com/moby/swarmkit/v2/manager/orchestrator" + "github.com/moby/swarmkit/v2/manager/orchestrator/restart" + "github.com/moby/swarmkit/v2/manager/state/store" gogotypes "github.com/gogo/protobuf/types" ) diff --git a/manager/orchestrator/taskreaper/task_reaper.go b/manager/orchestrator/taskreaper/task_reaper.go index 7fdb0a65d0..43f090bc8c 100644 --- a/manager/orchestrator/taskreaper/task_reaper.go +++ b/manager/orchestrator/taskreaper/task_reaper.go @@ -6,11 +6,11 @@ import ( "sync" "time" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/log" - "github.com/docker/swarmkit/manager/orchestrator" - "github.com/docker/swarmkit/manager/state" - "github.com/docker/swarmkit/manager/state/store" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/log" + "github.com/moby/swarmkit/v2/manager/orchestrator" + "github.com/moby/swarmkit/v2/manager/state" + "github.com/moby/swarmkit/v2/manager/state/store" ) const ( diff --git a/manager/orchestrator/taskreaper/task_reaper_test.go b/manager/orchestrator/taskreaper/task_reaper_test.go index 0c6b9a9849..fc96556989 100644 --- a/manager/orchestrator/taskreaper/task_reaper_test.go +++ b/manager/orchestrator/taskreaper/task_reaper_test.go @@ -5,19 +5,19 @@ import ( "fmt" "time" - "github.com/docker/swarmkit/manager/orchestrator" + "github.com/moby/swarmkit/v2/manager/orchestrator" "testing" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/identity" - "github.com/docker/swarmkit/manager/orchestrator/replicated" - "github.com/docker/swarmkit/manager/orchestrator/testutils" - "github.com/docker/swarmkit/manager/state" - "github.com/docker/swarmkit/manager/state/store" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/identity" + "github.com/moby/swarmkit/v2/manager/orchestrator/replicated" + "github.com/moby/swarmkit/v2/manager/orchestrator/testutils" + "github.com/moby/swarmkit/v2/manager/state" + "github.com/moby/swarmkit/v2/manager/state/store" gogotypes "github.com/gogo/protobuf/types" ) diff --git a/manager/orchestrator/testutils/testutils.go b/manager/orchestrator/testutils/testutils.go index 09602ec256..00973d3526 100644 --- a/manager/orchestrator/testutils/testutils.go +++ b/manager/orchestrator/testutils/testutils.go @@ -6,8 +6,8 @@ import ( "time" "github.com/docker/go-events" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/manager/state" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/manager/state" "github.com/stretchr/testify/assert" ) diff --git a/manager/orchestrator/update/updater.go b/manager/orchestrator/update/updater.go index e181a4ffa2..ba9a996212 100644 --- a/manager/orchestrator/update/updater.go +++ b/manager/orchestrator/update/updater.go @@ -9,15 +9,15 @@ import ( "time" "github.com/docker/go-events" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/api/defaults" - "github.com/docker/swarmkit/log" - "github.com/docker/swarmkit/manager/orchestrator" - "github.com/docker/swarmkit/manager/orchestrator/restart" - "github.com/docker/swarmkit/manager/state" - "github.com/docker/swarmkit/manager/state/store" - "github.com/docker/swarmkit/protobuf/ptypes" - "github.com/docker/swarmkit/watch" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/api/defaults" + "github.com/moby/swarmkit/v2/log" + "github.com/moby/swarmkit/v2/manager/orchestrator" + "github.com/moby/swarmkit/v2/manager/orchestrator/restart" + "github.com/moby/swarmkit/v2/manager/state" + "github.com/moby/swarmkit/v2/manager/state/store" + "github.com/moby/swarmkit/v2/protobuf/ptypes" + "github.com/moby/swarmkit/v2/watch" gogotypes "github.com/gogo/protobuf/types" ) diff --git a/manager/orchestrator/update/updater_test.go b/manager/orchestrator/update/updater_test.go index d54086d529..54c92ebda1 100644 --- a/manager/orchestrator/update/updater_test.go +++ b/manager/orchestrator/update/updater_test.go @@ -5,11 +5,11 @@ import ( "testing" "time" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/manager/orchestrator" - "github.com/docker/swarmkit/manager/orchestrator/restart" - "github.com/docker/swarmkit/manager/state" - "github.com/docker/swarmkit/manager/state/store" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/manager/orchestrator" + "github.com/moby/swarmkit/v2/manager/orchestrator/restart" + "github.com/moby/swarmkit/v2/manager/state" + "github.com/moby/swarmkit/v2/manager/state/store" gogotypes "github.com/gogo/protobuf/types" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/manager/orchestrator/volumeenforcer/volume_enforcer.go b/manager/orchestrator/volumeenforcer/volume_enforcer.go index f9de16f303..48357dd619 100644 --- a/manager/orchestrator/volumeenforcer/volume_enforcer.go +++ b/manager/orchestrator/volumeenforcer/volume_enforcer.go @@ -1,9 +1,9 @@ package volumeenforcer import ( - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/log" - "github.com/docker/swarmkit/manager/state/store" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/log" + "github.com/moby/swarmkit/v2/manager/state/store" ) // VolumeEnforcer is a component, styled off of the ConstraintEnforcer, that diff --git a/manager/orchestrator/volumeenforcer/volume_enforcer_test.go b/manager/orchestrator/volumeenforcer/volume_enforcer_test.go index 4b15af9d4c..9d4e126ece 100644 --- a/manager/orchestrator/volumeenforcer/volume_enforcer_test.go +++ b/manager/orchestrator/volumeenforcer/volume_enforcer_test.go @@ -4,8 +4,8 @@ import ( . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/manager/state/store" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/manager/state/store" ) var _ = Describe("VolumeEnforcer", func() { diff --git a/manager/resourceapi/allocator.go b/manager/resourceapi/allocator.go index 545e4ded99..b8d876ab7c 100644 --- a/manager/resourceapi/allocator.go +++ b/manager/resourceapi/allocator.go @@ -5,11 +5,11 @@ import ( "errors" "time" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/ca" - "github.com/docker/swarmkit/identity" - "github.com/docker/swarmkit/manager/state/store" - "github.com/docker/swarmkit/protobuf/ptypes" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/ca" + "github.com/moby/swarmkit/v2/identity" + "github.com/moby/swarmkit/v2/manager/state/store" + "github.com/moby/swarmkit/v2/protobuf/ptypes" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/manager/role_manager.go b/manager/role_manager.go index e5901525b9..54323de981 100644 --- a/manager/role_manager.go +++ b/manager/role_manager.go @@ -5,11 +5,11 @@ import ( "time" "code.cloudfoundry.org/clock" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/log" - "github.com/docker/swarmkit/manager/state/raft" - "github.com/docker/swarmkit/manager/state/raft/membership" - "github.com/docker/swarmkit/manager/state/store" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/log" + "github.com/moby/swarmkit/v2/manager/state/raft" + "github.com/moby/swarmkit/v2/manager/state/raft/membership" + "github.com/moby/swarmkit/v2/manager/state/store" ) const ( diff --git a/manager/role_manager_test.go b/manager/role_manager_test.go index 91e1b02813..267ca28385 100644 --- a/manager/role_manager_test.go +++ b/manager/role_manager_test.go @@ -4,11 +4,11 @@ import ( "errors" "testing" - "github.com/docker/swarmkit/api" - cautils "github.com/docker/swarmkit/ca/testutils" - raftutils "github.com/docker/swarmkit/manager/state/raft/testutils" - "github.com/docker/swarmkit/manager/state/store" - "github.com/docker/swarmkit/testutils" + "github.com/moby/swarmkit/v2/api" + cautils "github.com/moby/swarmkit/v2/ca/testutils" + raftutils "github.com/moby/swarmkit/v2/manager/state/raft/testutils" + "github.com/moby/swarmkit/v2/manager/state/store" + "github.com/moby/swarmkit/v2/testutils" "github.com/stretchr/testify/require" ) diff --git a/manager/scheduler/constraint_test.go b/manager/scheduler/constraint_test.go index 04097c8d34..fc795b11b1 100644 --- a/manager/scheduler/constraint_test.go +++ b/manager/scheduler/constraint_test.go @@ -3,7 +3,7 @@ package scheduler import ( "testing" - "github.com/docker/swarmkit/api" + "github.com/moby/swarmkit/v2/api" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/manager/scheduler/filter.go b/manager/scheduler/filter.go index 979329e3d4..a7db0dbcdf 100644 --- a/manager/scheduler/filter.go +++ b/manager/scheduler/filter.go @@ -4,9 +4,9 @@ import ( "fmt" "strings" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/api/genericresource" - "github.com/docker/swarmkit/manager/constraint" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/api/genericresource" + "github.com/moby/swarmkit/v2/manager/constraint" ) // Filter checks whether the given task can run on the given node. diff --git a/manager/scheduler/nodeinfo.go b/manager/scheduler/nodeinfo.go index a854ab63e6..a328bae34d 100644 --- a/manager/scheduler/nodeinfo.go +++ b/manager/scheduler/nodeinfo.go @@ -4,9 +4,9 @@ import ( "context" "time" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/api/genericresource" - "github.com/docker/swarmkit/log" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/api/genericresource" + "github.com/moby/swarmkit/v2/log" ) // hostPortSpec specifies a used host port. diff --git a/manager/scheduler/nodeinfo_test.go b/manager/scheduler/nodeinfo_test.go index 25e6eda1bd..5494d4c81c 100644 --- a/manager/scheduler/nodeinfo_test.go +++ b/manager/scheduler/nodeinfo_test.go @@ -3,8 +3,8 @@ package scheduler import ( "testing" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/api/genericresource" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/api/genericresource" "github.com/stretchr/testify/assert" ) diff --git a/manager/scheduler/nodeset.go b/manager/scheduler/nodeset.go index b83704a18d..ba06f1dfc3 100644 --- a/manager/scheduler/nodeset.go +++ b/manager/scheduler/nodeset.go @@ -5,8 +5,8 @@ import ( "errors" "strings" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/manager/constraint" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/manager/constraint" ) var errNodeNotFound = errors.New("node not found in scheduler dataset") diff --git a/manager/scheduler/pipeline.go b/manager/scheduler/pipeline.go index ba6ef05d9f..71256eeb85 100644 --- a/manager/scheduler/pipeline.go +++ b/manager/scheduler/pipeline.go @@ -3,7 +3,7 @@ package scheduler import ( "sort" - "github.com/docker/swarmkit/api" + "github.com/moby/swarmkit/v2/api" ) var ( diff --git a/manager/scheduler/scheduler.go b/manager/scheduler/scheduler.go index 4638ec1831..27995a5f49 100644 --- a/manager/scheduler/scheduler.go +++ b/manager/scheduler/scheduler.go @@ -5,12 +5,12 @@ import ( "sync" "time" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/api/genericresource" - "github.com/docker/swarmkit/log" - "github.com/docker/swarmkit/manager/state" - "github.com/docker/swarmkit/manager/state/store" - "github.com/docker/swarmkit/protobuf/ptypes" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/api/genericresource" + "github.com/moby/swarmkit/v2/log" + "github.com/moby/swarmkit/v2/manager/state" + "github.com/moby/swarmkit/v2/manager/state/store" + "github.com/moby/swarmkit/v2/protobuf/ptypes" ) const ( diff --git a/manager/scheduler/scheduler_ginkgo_test.go b/manager/scheduler/scheduler_ginkgo_test.go index c28c128536..8ecdb02d23 100644 --- a/manager/scheduler/scheduler_ginkgo_test.go +++ b/manager/scheduler/scheduler_ginkgo_test.go @@ -9,9 +9,9 @@ import ( . "github.com/onsi/gomega" . "github.com/onsi/gomega/types" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/manager/orchestrator/testutils" - "github.com/docker/swarmkit/manager/state/store" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/manager/orchestrator/testutils" + "github.com/moby/swarmkit/v2/manager/state/store" ) // scheduler_ginkgo_test.go contains ginkgo BDD tests of the swarmkit scheduler diff --git a/manager/scheduler/scheduler_test.go b/manager/scheduler/scheduler_test.go index 737a2ba636..b49b5b6b73 100644 --- a/manager/scheduler/scheduler_test.go +++ b/manager/scheduler/scheduler_test.go @@ -10,11 +10,11 @@ import ( "time" "github.com/docker/go-events" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/api/genericresource" - "github.com/docker/swarmkit/identity" - "github.com/docker/swarmkit/manager/state" - "github.com/docker/swarmkit/manager/state/store" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/api/genericresource" + "github.com/moby/swarmkit/v2/identity" + "github.com/moby/swarmkit/v2/manager/state" + "github.com/moby/swarmkit/v2/manager/state/store" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/manager/scheduler/topology.go b/manager/scheduler/topology.go index 05c3ad8884..8661fc6372 100644 --- a/manager/scheduler/topology.go +++ b/manager/scheduler/topology.go @@ -1,7 +1,7 @@ package scheduler import ( - "github.com/docker/swarmkit/api" + "github.com/moby/swarmkit/v2/api" ) // IsInTopology takes a Topology `top` (which is reported by a Node) and a list diff --git a/manager/scheduler/topology_test.go b/manager/scheduler/topology_test.go index 6b31202273..4bbe6e3da3 100644 --- a/manager/scheduler/topology_test.go +++ b/manager/scheduler/topology_test.go @@ -3,7 +3,7 @@ package scheduler import ( "testing" - "github.com/docker/swarmkit/api" + "github.com/moby/swarmkit/v2/api" ) func TestIsInTopology(t *testing.T) { diff --git a/manager/scheduler/volumes.go b/manager/scheduler/volumes.go index 769ff576d3..ee2137acbc 100644 --- a/manager/scheduler/volumes.go +++ b/manager/scheduler/volumes.go @@ -4,8 +4,8 @@ import ( "fmt" "strings" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/manager/state/store" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/manager/state/store" ) // the scheduler package does double duty -- in addition to choosing nodes, it diff --git a/manager/scheduler/volumes_test.go b/manager/scheduler/volumes_test.go index 173eb0fe08..cacded116b 100644 --- a/manager/scheduler/volumes_test.go +++ b/manager/scheduler/volumes_test.go @@ -7,8 +7,8 @@ import ( . "github.com/onsi/ginkgo/extensions/table" . "github.com/onsi/gomega" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/manager/state/store" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/manager/state/store" ) // cannedVolume is a quick helper method that creates canned volumes, using the diff --git a/manager/state/proposer.go b/manager/state/proposer.go index 8d53f5772f..79aabdcef7 100644 --- a/manager/state/proposer.go +++ b/manager/state/proposer.go @@ -3,7 +3,7 @@ package state import ( "context" - "github.com/docker/swarmkit/api" + "github.com/moby/swarmkit/v2/api" ) // A Change includes a version number and a set of store actions from a diff --git a/manager/state/raft/membership/cluster.go b/manager/state/raft/membership/cluster.go index ace8060bc6..062d8aa526 100644 --- a/manager/state/raft/membership/cluster.go +++ b/manager/state/raft/membership/cluster.go @@ -4,8 +4,8 @@ import ( "errors" "sync" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/watch" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/watch" "github.com/gogo/protobuf/proto" "go.etcd.io/etcd/raft/v3/raftpb" ) diff --git a/manager/state/raft/membership/cluster_test.go b/manager/state/raft/membership/cluster_test.go index 3b5de244f7..5efeb300d0 100644 --- a/manager/state/raft/membership/cluster_test.go +++ b/manager/state/raft/membership/cluster_test.go @@ -11,12 +11,12 @@ import ( "google.golang.org/grpc/grpclog" - "github.com/docker/swarmkit/api" - cautils "github.com/docker/swarmkit/ca/testutils" - "github.com/docker/swarmkit/manager/state/raft" - "github.com/docker/swarmkit/manager/state/raft/membership" - raftutils "github.com/docker/swarmkit/manager/state/raft/testutils" - "github.com/docker/swarmkit/testutils" + "github.com/moby/swarmkit/v2/api" + cautils "github.com/moby/swarmkit/v2/ca/testutils" + "github.com/moby/swarmkit/v2/manager/state/raft" + "github.com/moby/swarmkit/v2/manager/state/raft/membership" + raftutils "github.com/moby/swarmkit/v2/manager/state/raft/testutils" + "github.com/moby/swarmkit/v2/testutils" "github.com/sirupsen/logrus" "github.com/stretchr/testify/assert" "go.etcd.io/etcd/raft/v3/raftpb" diff --git a/manager/state/raft/raft.go b/manager/state/raft/raft.go index 31912fcb0e..60407a8b2c 100644 --- a/manager/state/raft/raft.go +++ b/manager/state/raft/raft.go @@ -16,16 +16,16 @@ import ( "code.cloudfoundry.org/clock" "github.com/docker/go-events" "github.com/docker/go-metrics" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/ca" - "github.com/docker/swarmkit/log" - "github.com/docker/swarmkit/manager/raftselector" - "github.com/docker/swarmkit/manager/state" - "github.com/docker/swarmkit/manager/state/raft/membership" - "github.com/docker/swarmkit/manager/state/raft/storage" - "github.com/docker/swarmkit/manager/state/raft/transport" - "github.com/docker/swarmkit/manager/state/store" - "github.com/docker/swarmkit/watch" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/ca" + "github.com/moby/swarmkit/v2/log" + "github.com/moby/swarmkit/v2/manager/raftselector" + "github.com/moby/swarmkit/v2/manager/state" + "github.com/moby/swarmkit/v2/manager/state/raft/membership" + "github.com/moby/swarmkit/v2/manager/state/raft/storage" + "github.com/moby/swarmkit/v2/manager/state/raft/transport" + "github.com/moby/swarmkit/v2/manager/state/store" + "github.com/moby/swarmkit/v2/watch" "github.com/gogo/protobuf/proto" "github.com/pkg/errors" "github.com/sirupsen/logrus" diff --git a/manager/state/raft/raft_test.go b/manager/state/raft/raft_test.go index 062d90b671..ecde80ecb6 100644 --- a/manager/state/raft/raft_test.go +++ b/manager/state/raft/raft_test.go @@ -19,14 +19,14 @@ import ( "google.golang.org/grpc/status" "code.cloudfoundry.org/clock/fakeclock" - "github.com/docker/swarmkit/api" - cautils "github.com/docker/swarmkit/ca/testutils" - "github.com/docker/swarmkit/manager/state" - "github.com/docker/swarmkit/manager/state/raft" - raftutils "github.com/docker/swarmkit/manager/state/raft/testutils" - "github.com/docker/swarmkit/manager/state/raft/transport" - "github.com/docker/swarmkit/manager/state/store" - "github.com/docker/swarmkit/testutils" + "github.com/moby/swarmkit/v2/api" + cautils "github.com/moby/swarmkit/v2/ca/testutils" + "github.com/moby/swarmkit/v2/manager/state" + "github.com/moby/swarmkit/v2/manager/state/raft" + raftutils "github.com/moby/swarmkit/v2/manager/state/raft/testutils" + "github.com/moby/swarmkit/v2/manager/state/raft/transport" + "github.com/moby/swarmkit/v2/manager/state/store" + "github.com/moby/swarmkit/v2/testutils" "github.com/sirupsen/logrus" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/manager/state/raft/storage.go b/manager/state/raft/storage.go index 07b687706e..28f4102ac2 100644 --- a/manager/state/raft/storage.go +++ b/manager/state/raft/storage.go @@ -5,12 +5,12 @@ import ( "fmt" "github.com/docker/go-metrics" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/log" - "github.com/docker/swarmkit/manager/encryption" - "github.com/docker/swarmkit/manager/state/raft/membership" - "github.com/docker/swarmkit/manager/state/raft/storage" - "github.com/docker/swarmkit/manager/state/store" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/log" + "github.com/moby/swarmkit/v2/manager/encryption" + "github.com/moby/swarmkit/v2/manager/state/raft/membership" + "github.com/moby/swarmkit/v2/manager/state/raft/storage" + "github.com/moby/swarmkit/v2/manager/state/store" "github.com/pkg/errors" "go.etcd.io/etcd/raft/v3" "go.etcd.io/etcd/raft/v3/raftpb" diff --git a/manager/state/raft/storage/common_test.go b/manager/state/raft/storage/common_test.go index 543dbf2b79..3c04f33efd 100644 --- a/manager/state/raft/storage/common_test.go +++ b/manager/state/raft/storage/common_test.go @@ -4,8 +4,8 @@ import ( "bytes" "fmt" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/manager/encryption" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/manager/encryption" ) // Common test utilities diff --git a/manager/state/raft/storage/snapwrap.go b/manager/state/raft/storage/snapwrap.go index 5819df6296..02f9afea7f 100644 --- a/manager/state/raft/storage/snapwrap.go +++ b/manager/state/raft/storage/snapwrap.go @@ -6,7 +6,7 @@ import ( "sort" "strings" - "github.com/docker/swarmkit/manager/encryption" + "github.com/moby/swarmkit/v2/manager/encryption" "github.com/pkg/errors" "go.etcd.io/etcd/client/pkg/v3/fileutil" "go.etcd.io/etcd/raft/v3/raftpb" diff --git a/manager/state/raft/storage/snapwrap_test.go b/manager/state/raft/storage/snapwrap_test.go index 9f8bedbeb3..e458d80658 100644 --- a/manager/state/raft/storage/snapwrap_test.go +++ b/manager/state/raft/storage/snapwrap_test.go @@ -6,8 +6,8 @@ import ( "path/filepath" "testing" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/manager/encryption" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/manager/encryption" "github.com/stretchr/testify/require" "go.etcd.io/etcd/raft/v3/raftpb" ) diff --git a/manager/state/raft/storage/storage.go b/manager/state/raft/storage/storage.go index 347d7db7f8..8e7476156f 100644 --- a/manager/state/raft/storage/storage.go +++ b/manager/state/raft/storage/storage.go @@ -7,8 +7,8 @@ import ( "path/filepath" "sync" - "github.com/docker/swarmkit/log" - "github.com/docker/swarmkit/manager/encryption" + "github.com/moby/swarmkit/v2/log" + "github.com/moby/swarmkit/v2/manager/encryption" "github.com/pkg/errors" "go.etcd.io/etcd/client/pkg/v3/fileutil" "go.etcd.io/etcd/raft/v3/raftpb" diff --git a/manager/state/raft/storage/storage_test.go b/manager/state/raft/storage/storage_test.go index 77ddbd5409..e6fd4f534a 100644 --- a/manager/state/raft/storage/storage_test.go +++ b/manager/state/raft/storage/storage_test.go @@ -6,7 +6,7 @@ import ( "path/filepath" "testing" - "github.com/docker/swarmkit/manager/encryption" + "github.com/moby/swarmkit/v2/manager/encryption" "github.com/pkg/errors" "github.com/stretchr/testify/require" "go.etcd.io/etcd/raft/v3/raftpb" diff --git a/manager/state/raft/storage/walwrap.go b/manager/state/raft/storage/walwrap.go index 13eab9a19a..2fd0a91804 100644 --- a/manager/state/raft/storage/walwrap.go +++ b/manager/state/raft/storage/walwrap.go @@ -8,8 +8,8 @@ import ( "sort" "strings" - "github.com/docker/swarmkit/log" - "github.com/docker/swarmkit/manager/encryption" + "github.com/moby/swarmkit/v2/log" + "github.com/moby/swarmkit/v2/manager/encryption" "github.com/pkg/errors" "go.etcd.io/etcd/raft/v3/raftpb" "go.etcd.io/etcd/server/v3/wal" diff --git a/manager/state/raft/storage/walwrap_test.go b/manager/state/raft/storage/walwrap_test.go index 534e47c61b..feb505e12a 100644 --- a/manager/state/raft/storage/walwrap_test.go +++ b/manager/state/raft/storage/walwrap_test.go @@ -8,8 +8,8 @@ import ( "path/filepath" "testing" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/manager/encryption" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/manager/encryption" "github.com/stretchr/testify/require" "go.etcd.io/etcd/raft/v3/raftpb" "go.etcd.io/etcd/server/v3/wal/walpb" diff --git a/manager/state/raft/storage_test.go b/manager/state/raft/storage_test.go index 664906324a..cb5c731a36 100644 --- a/manager/state/raft/storage_test.go +++ b/manager/state/raft/storage_test.go @@ -10,12 +10,12 @@ import ( "time" "code.cloudfoundry.org/clock/fakeclock" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/manager/state/raft" - "github.com/docker/swarmkit/manager/state/raft/storage" - raftutils "github.com/docker/swarmkit/manager/state/raft/testutils" - "github.com/docker/swarmkit/manager/state/store" - "github.com/docker/swarmkit/testutils" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/manager/state/raft" + "github.com/moby/swarmkit/v2/manager/state/raft/storage" + raftutils "github.com/moby/swarmkit/v2/manager/state/raft/testutils" + "github.com/moby/swarmkit/v2/manager/state/store" + "github.com/moby/swarmkit/v2/testutils" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/manager/state/raft/testutils/testutils.go b/manager/state/raft/testutils/testutils.go index 92f508a08e..613f7f3128 100644 --- a/manager/state/raft/testutils/testutils.go +++ b/manager/state/raft/testutils/testutils.go @@ -12,14 +12,14 @@ import ( "google.golang.org/grpc" "code.cloudfoundry.org/clock/fakeclock" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/ca" - cautils "github.com/docker/swarmkit/ca/testutils" - "github.com/docker/swarmkit/identity" - "github.com/docker/swarmkit/manager/health" - "github.com/docker/swarmkit/manager/state/raft" - "github.com/docker/swarmkit/manager/state/store" - "github.com/docker/swarmkit/testutils" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/ca" + cautils "github.com/moby/swarmkit/v2/ca/testutils" + "github.com/moby/swarmkit/v2/identity" + "github.com/moby/swarmkit/v2/manager/health" + "github.com/moby/swarmkit/v2/manager/state/raft" + "github.com/moby/swarmkit/v2/manager/state/store" + "github.com/moby/swarmkit/v2/testutils" "github.com/pkg/errors" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/manager/state/raft/transport/mock_raft_test.go b/manager/state/raft/transport/mock_raft_test.go index 1804e80ece..0c344bb494 100644 --- a/manager/state/raft/transport/mock_raft_test.go +++ b/manager/state/raft/transport/mock_raft_test.go @@ -6,10 +6,10 @@ import ( "net" "time" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/log" - "github.com/docker/swarmkit/manager/health" - "github.com/docker/swarmkit/manager/state/raft/membership" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/log" + "github.com/moby/swarmkit/v2/manager/health" + "github.com/moby/swarmkit/v2/manager/state/raft/membership" "go.etcd.io/etcd/raft/v3" "go.etcd.io/etcd/raft/v3/raftpb" "google.golang.org/grpc" diff --git a/manager/state/raft/transport/peer.go b/manager/state/raft/transport/peer.go index 5e98a9915d..237b871619 100644 --- a/manager/state/raft/transport/peer.go +++ b/manager/state/raft/transport/peer.go @@ -9,9 +9,9 @@ import ( "google.golang.org/grpc" "google.golang.org/grpc/codes" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/log" - "github.com/docker/swarmkit/manager/state/raft/membership" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/log" + "github.com/moby/swarmkit/v2/manager/state/raft/membership" "github.com/pkg/errors" "go.etcd.io/etcd/raft/v3" "go.etcd.io/etcd/raft/v3/raftpb" diff --git a/manager/state/raft/transport/transport.go b/manager/state/raft/transport/transport.go index f752b092ad..a2bc5a7e2f 100644 --- a/manager/state/raft/transport/transport.go +++ b/manager/state/raft/transport/transport.go @@ -13,7 +13,7 @@ import ( "google.golang.org/grpc" "google.golang.org/grpc/credentials" - "github.com/docker/swarmkit/log" + "github.com/moby/swarmkit/v2/log" "github.com/pkg/errors" "go.etcd.io/etcd/raft/v3" "go.etcd.io/etcd/raft/v3/raftpb" diff --git a/manager/state/raft/util.go b/manager/state/raft/util.go index 1a49f76cb4..423831527c 100644 --- a/manager/state/raft/util.go +++ b/manager/state/raft/util.go @@ -5,9 +5,9 @@ import ( "net" "time" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/manager/state" - "github.com/docker/swarmkit/manager/state/store" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/manager/state" + "github.com/moby/swarmkit/v2/manager/state/store" grpc_prometheus "github.com/grpc-ecosystem/go-grpc-prometheus" "google.golang.org/grpc" "google.golang.org/grpc/credentials" diff --git a/manager/state/store/apply.go b/manager/state/store/apply.go index e5f5c494e4..6432ccf9d1 100644 --- a/manager/state/store/apply.go +++ b/manager/state/store/apply.go @@ -4,8 +4,8 @@ import ( "errors" "github.com/docker/go-events" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/manager/state" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/manager/state" ) // Apply takes an item from the event stream of one Store and applies it to diff --git a/manager/state/store/by.go b/manager/state/store/by.go index 59672410af..a26ea3f742 100644 --- a/manager/state/store/by.go +++ b/manager/state/store/by.go @@ -1,6 +1,6 @@ package store -import "github.com/docker/swarmkit/api" +import "github.com/moby/swarmkit/v2/api" // By is an interface type passed to Find methods. Implementations must be // defined in this package. diff --git a/manager/state/store/clusters.go b/manager/state/store/clusters.go index 495fc04037..bf5f1da8f1 100644 --- a/manager/state/store/clusters.go +++ b/manager/state/store/clusters.go @@ -3,7 +3,7 @@ package store import ( "strings" - "github.com/docker/swarmkit/api" + "github.com/moby/swarmkit/v2/api" memdb "github.com/hashicorp/go-memdb" ) diff --git a/manager/state/store/configs.go b/manager/state/store/configs.go index d02e04ba9b..5805ca4579 100644 --- a/manager/state/store/configs.go +++ b/manager/state/store/configs.go @@ -3,7 +3,7 @@ package store import ( "strings" - "github.com/docker/swarmkit/api" + "github.com/moby/swarmkit/v2/api" memdb "github.com/hashicorp/go-memdb" ) diff --git a/manager/state/store/extensions.go b/manager/state/store/extensions.go index 8dac4baac7..eb215852df 100644 --- a/manager/state/store/extensions.go +++ b/manager/state/store/extensions.go @@ -4,7 +4,7 @@ import ( "errors" "strings" - "github.com/docker/swarmkit/api" + "github.com/moby/swarmkit/v2/api" memdb "github.com/hashicorp/go-memdb" ) diff --git a/manager/state/store/memory.go b/manager/state/store/memory.go index 3b3f28a263..1d81e3b430 100644 --- a/manager/state/store/memory.go +++ b/manager/state/store/memory.go @@ -13,10 +13,10 @@ import ( "github.com/docker/go-events" "github.com/docker/go-metrics" - "github.com/docker/swarmkit/api" - pb "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/manager/state" - "github.com/docker/swarmkit/watch" + "github.com/moby/swarmkit/v2/api" + pb "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/manager/state" + "github.com/moby/swarmkit/v2/watch" gogotypes "github.com/gogo/protobuf/types" memdb "github.com/hashicorp/go-memdb" ) diff --git a/manager/state/store/memory_test.go b/manager/state/store/memory_test.go index dbccb72004..8635bd8161 100644 --- a/manager/state/store/memory_test.go +++ b/manager/state/store/memory_test.go @@ -8,10 +8,10 @@ import ( "time" events "github.com/docker/go-events" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/identity" - "github.com/docker/swarmkit/manager/state" - "github.com/docker/swarmkit/manager/state/testutils" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/identity" + "github.com/moby/swarmkit/v2/manager/state" + "github.com/moby/swarmkit/v2/manager/state/testutils" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/manager/state/store/networks.go b/manager/state/store/networks.go index fa887b3b11..4b3bcfb86a 100644 --- a/manager/state/store/networks.go +++ b/manager/state/store/networks.go @@ -3,7 +3,7 @@ package store import ( "strings" - "github.com/docker/swarmkit/api" + "github.com/moby/swarmkit/v2/api" memdb "github.com/hashicorp/go-memdb" ) diff --git a/manager/state/store/nodes.go b/manager/state/store/nodes.go index fa6ae85bd7..1a81bb9ec1 100644 --- a/manager/state/store/nodes.go +++ b/manager/state/store/nodes.go @@ -4,7 +4,7 @@ import ( "strconv" "strings" - "github.com/docker/swarmkit/api" + "github.com/moby/swarmkit/v2/api" memdb "github.com/hashicorp/go-memdb" ) diff --git a/manager/state/store/object.go b/manager/state/store/object.go index 89029afb9f..e951843c12 100644 --- a/manager/state/store/object.go +++ b/manager/state/store/object.go @@ -1,7 +1,7 @@ package store import ( - "github.com/docker/swarmkit/api" + "github.com/moby/swarmkit/v2/api" memdb "github.com/hashicorp/go-memdb" ) diff --git a/manager/state/store/resources.go b/manager/state/store/resources.go index 9852f64fe0..537d71261c 100644 --- a/manager/state/store/resources.go +++ b/manager/state/store/resources.go @@ -3,7 +3,7 @@ package store import ( "strings" - "github.com/docker/swarmkit/api" + "github.com/moby/swarmkit/v2/api" memdb "github.com/hashicorp/go-memdb" "github.com/pkg/errors" ) diff --git a/manager/state/store/secrets.go b/manager/state/store/secrets.go index bf5653fd72..4271011882 100644 --- a/manager/state/store/secrets.go +++ b/manager/state/store/secrets.go @@ -3,7 +3,7 @@ package store import ( "strings" - "github.com/docker/swarmkit/api" + "github.com/moby/swarmkit/v2/api" memdb "github.com/hashicorp/go-memdb" ) diff --git a/manager/state/store/services.go b/manager/state/store/services.go index a581737369..6cd03b082c 100644 --- a/manager/state/store/services.go +++ b/manager/state/store/services.go @@ -3,8 +3,8 @@ package store import ( "strings" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/api/naming" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/api/naming" memdb "github.com/hashicorp/go-memdb" ) diff --git a/manager/state/store/tasks.go b/manager/state/store/tasks.go index 4385e48e55..3097b40c63 100644 --- a/manager/state/store/tasks.go +++ b/manager/state/store/tasks.go @@ -4,8 +4,8 @@ import ( "strconv" "strings" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/api/naming" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/api/naming" memdb "github.com/hashicorp/go-memdb" ) diff --git a/manager/state/store/volumes.go b/manager/state/store/volumes.go index 9f3195c135..444d50cc0f 100644 --- a/manager/state/store/volumes.go +++ b/manager/state/store/volumes.go @@ -3,7 +3,7 @@ package store import ( "strings" - "github.com/docker/swarmkit/api" + "github.com/moby/swarmkit/v2/api" memdb "github.com/hashicorp/go-memdb" ) diff --git a/manager/state/testutils/mock_proposer.go b/manager/state/testutils/mock_proposer.go index 38b0662b3e..9984ddb3f5 100644 --- a/manager/state/testutils/mock_proposer.go +++ b/manager/state/testutils/mock_proposer.go @@ -4,8 +4,8 @@ import ( "context" "errors" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/manager/state" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/manager/state" ) // MockProposer is a simple proposer implementation for use in tests. diff --git a/manager/state/watch.go b/manager/state/watch.go index ad0ebd75fa..183c8964ee 100644 --- a/manager/state/watch.go +++ b/manager/state/watch.go @@ -2,8 +2,8 @@ package state import ( "github.com/docker/go-events" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/watch" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/watch" ) // EventCommit delineates a transaction boundary. diff --git a/manager/watchapi/server.go b/manager/watchapi/server.go index eb086b8ac0..128d2a20d8 100644 --- a/manager/watchapi/server.go +++ b/manager/watchapi/server.go @@ -5,7 +5,7 @@ import ( "errors" "sync" - "github.com/docker/swarmkit/manager/state/store" + "github.com/moby/swarmkit/v2/manager/state/store" ) var ( diff --git a/manager/watchapi/server_test.go b/manager/watchapi/server_test.go index 7f24643edc..174045f4cc 100644 --- a/manager/watchapi/server_test.go +++ b/manager/watchapi/server_test.go @@ -8,10 +8,10 @@ import ( "testing" "time" - "github.com/docker/swarmkit/api" - cautils "github.com/docker/swarmkit/ca/testutils" - "github.com/docker/swarmkit/manager/state/store" - stateutils "github.com/docker/swarmkit/manager/state/testutils" + "github.com/moby/swarmkit/v2/api" + cautils "github.com/moby/swarmkit/v2/ca/testutils" + "github.com/moby/swarmkit/v2/manager/state/store" + stateutils "github.com/moby/swarmkit/v2/manager/state/testutils" "github.com/sirupsen/logrus" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/manager/watchapi/watch.go b/manager/watchapi/watch.go index 223dcb55d6..2fe526d79d 100644 --- a/manager/watchapi/watch.go +++ b/manager/watchapi/watch.go @@ -1,9 +1,9 @@ package watchapi import ( - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/manager/state" - "github.com/docker/swarmkit/manager/state/store" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/manager/state" + "github.com/moby/swarmkit/v2/manager/state/store" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/manager/watchapi/watch_test.go b/manager/watchapi/watch_test.go index 41aa7a0e97..79aba858a9 100644 --- a/manager/watchapi/watch_test.go +++ b/manager/watchapi/watch_test.go @@ -4,8 +4,8 @@ import ( "context" "testing" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/manager/state/store" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/manager/state/store" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/node/node.go b/node/node.go index c467a6c8d6..439e8757ba 100644 --- a/node/node.go +++ b/node/node.go @@ -15,24 +15,24 @@ import ( "sync" "time" - "github.com/docker/swarmkit/ca/keyutils" - "github.com/docker/swarmkit/identity" + "github.com/moby/swarmkit/v2/ca/keyutils" + "github.com/moby/swarmkit/v2/identity" "github.com/docker/docker/libnetwork/drivers/overlay/overlayutils" "github.com/docker/docker/pkg/plugingetter" "github.com/docker/go-metrics" - "github.com/docker/swarmkit/agent" - "github.com/docker/swarmkit/agent/exec" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/ca" - "github.com/docker/swarmkit/connectionbroker" - "github.com/docker/swarmkit/ioutils" - "github.com/docker/swarmkit/log" - "github.com/docker/swarmkit/manager" - "github.com/docker/swarmkit/manager/allocator/cnmallocator" - "github.com/docker/swarmkit/manager/encryption" - "github.com/docker/swarmkit/remotes" - "github.com/docker/swarmkit/xnet" + "github.com/moby/swarmkit/v2/agent" + "github.com/moby/swarmkit/v2/agent/exec" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/ca" + "github.com/moby/swarmkit/v2/connectionbroker" + "github.com/moby/swarmkit/v2/ioutils" + "github.com/moby/swarmkit/v2/log" + "github.com/moby/swarmkit/v2/manager" + "github.com/moby/swarmkit/v2/manager/allocator/cnmallocator" + "github.com/moby/swarmkit/v2/manager/encryption" + "github.com/moby/swarmkit/v2/remotes" + "github.com/moby/swarmkit/v2/xnet" grpc_prometheus "github.com/grpc-ecosystem/go-grpc-prometheus" "github.com/pkg/errors" "github.com/sirupsen/logrus" diff --git a/node/node_test.go b/node/node_test.go index 73eacc4d57..3895f5d96e 100644 --- a/node/node_test.go +++ b/node/node_test.go @@ -13,16 +13,16 @@ import ( "time" "github.com/cloudflare/cfssl/helpers" - "github.com/docker/swarmkit/agent" - agentutils "github.com/docker/swarmkit/agent/testutils" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/ca" - "github.com/docker/swarmkit/ca/keyutils" - cautils "github.com/docker/swarmkit/ca/testutils" - "github.com/docker/swarmkit/identity" - "github.com/docker/swarmkit/log" - "github.com/docker/swarmkit/manager/state/store" - "github.com/docker/swarmkit/testutils" + "github.com/moby/swarmkit/v2/agent" + agentutils "github.com/moby/swarmkit/v2/agent/testutils" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/ca" + "github.com/moby/swarmkit/v2/ca/keyutils" + cautils "github.com/moby/swarmkit/v2/ca/testutils" + "github.com/moby/swarmkit/v2/identity" + "github.com/moby/swarmkit/v2/log" + "github.com/moby/swarmkit/v2/manager/state/store" + "github.com/moby/swarmkit/v2/testutils" "github.com/pkg/errors" "github.com/stretchr/testify/require" ) diff --git a/protobuf/plugin/authenticatedwrapper/authenticatedwrapper.go b/protobuf/plugin/authenticatedwrapper/authenticatedwrapper.go index cf5fa26eed..096bbe5512 100644 --- a/protobuf/plugin/authenticatedwrapper/authenticatedwrapper.go +++ b/protobuf/plugin/authenticatedwrapper/authenticatedwrapper.go @@ -3,7 +3,7 @@ package authenticatedwrapper import ( "strings" - "github.com/docker/swarmkit/protobuf/plugin" + "github.com/moby/swarmkit/v2/protobuf/plugin" "github.com/gogo/protobuf/proto" "github.com/gogo/protobuf/protoc-gen-gogo/descriptor" "github.com/gogo/protobuf/protoc-gen-gogo/generator" diff --git a/protobuf/plugin/deepcopy/deepcopy.go b/protobuf/plugin/deepcopy/deepcopy.go index d5983c4e2b..27ab241051 100644 --- a/protobuf/plugin/deepcopy/deepcopy.go +++ b/protobuf/plugin/deepcopy/deepcopy.go @@ -1,10 +1,10 @@ package deepcopy import ( - "github.com/docker/swarmkit/protobuf/plugin" "github.com/gogo/protobuf/gogoproto" "github.com/gogo/protobuf/protoc-gen-gogo/descriptor" "github.com/gogo/protobuf/protoc-gen-gogo/generator" + "github.com/moby/swarmkit/v2/protobuf/plugin" ) type deepCopyGen struct { @@ -276,7 +276,7 @@ func (d *deepCopyGen) Generate(file *generator.FileDescriptor) { // TODO(stevvooe): Ideally, this could be taken as a parameter to the // deepcopy plugin to control the package import, but this is good enough, // for now. - d.copyPkg = d.NewImport("github.com/docker/swarmkit/api/deepcopy") + d.copyPkg = d.NewImport("github.com/moby/swarmkit/v2/api/deepcopy") d.P() for _, m := range file.Messages() { diff --git a/protobuf/plugin/deepcopy/test/deepcopy.pb.go b/protobuf/plugin/deepcopy/test/deepcopy.pb.go index 6a87c2f7ba..1b3d51dbe4 100644 --- a/protobuf/plugin/deepcopy/test/deepcopy.pb.go +++ b/protobuf/plugin/deepcopy/test/deepcopy.pb.go @@ -6,10 +6,10 @@ package test import ( bytes "bytes" fmt "fmt" - github_com_docker_swarmkit_api_deepcopy "github.com/docker/swarmkit/api/deepcopy" _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" github_com_gogo_protobuf_sortkeys "github.com/gogo/protobuf/sortkeys" + github_com_moby_swarmkit_v2_api_deepcopy "github.com/moby/swarmkit/v2/api/deepcopy" math "math" reflect "reflect" strings "strings" @@ -783,15 +783,15 @@ func (m *ExternalStruct) CopyFrom(src interface{}) { *m = *o if o.Field1 != nil { m.Field1 = &BasicScalar{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Field1, o.Field1) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Field1, o.Field1) } if o.Field2 != nil { m.Field2 = &RepeatedScalar{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Field2, o.Field2) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Field2, o.Field2) } if o.Field3 != nil { m.Field3 = &RepeatedScalarPacked{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Field3, o.Field3) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Field3, o.Field3) } } @@ -812,7 +812,7 @@ func (m *RepeatedExternalStruct) CopyFrom(src interface{}) { m.Field1 = make([]*BasicScalar, len(o.Field1)) for i := range m.Field1 { m.Field1[i] = &BasicScalar{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Field1[i], o.Field1[i]) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Field1[i], o.Field1[i]) } } @@ -820,7 +820,7 @@ func (m *RepeatedExternalStruct) CopyFrom(src interface{}) { m.Field2 = make([]*RepeatedScalar, len(o.Field2)) for i := range m.Field2 { m.Field2[i] = &RepeatedScalar{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Field2[i], o.Field2[i]) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Field2[i], o.Field2[i]) } } @@ -828,7 +828,7 @@ func (m *RepeatedExternalStruct) CopyFrom(src interface{}) { m.Field3 = make([]*RepeatedScalarPacked, len(o.Field3)) for i := range m.Field3 { m.Field3[i] = &RepeatedScalarPacked{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Field3[i], o.Field3[i]) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Field3[i], o.Field3[i]) } } @@ -847,9 +847,9 @@ func (m *NonNullableExternalStruct) CopyFrom(src interface{}) { o := src.(*NonNullableExternalStruct) *m = *o - github_com_docker_swarmkit_api_deepcopy.Copy(&m.Field1, &o.Field1) - github_com_docker_swarmkit_api_deepcopy.Copy(&m.Field2, &o.Field2) - github_com_docker_swarmkit_api_deepcopy.Copy(&m.Field3, &o.Field3) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(&m.Field1, &o.Field1) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(&m.Field2, &o.Field2) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(&m.Field3, &o.Field3) } func (m *RepeatedNonNullableExternalStruct) Copy() *RepeatedNonNullableExternalStruct { @@ -868,21 +868,21 @@ func (m *RepeatedNonNullableExternalStruct) CopyFrom(src interface{}) { if o.Field1 != nil { m.Field1 = make([]BasicScalar, len(o.Field1)) for i := range m.Field1 { - github_com_docker_swarmkit_api_deepcopy.Copy(&m.Field1[i], &o.Field1[i]) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(&m.Field1[i], &o.Field1[i]) } } if o.Field2 != nil { m.Field2 = make([]RepeatedScalar, len(o.Field2)) for i := range m.Field2 { - github_com_docker_swarmkit_api_deepcopy.Copy(&m.Field2[i], &o.Field2[i]) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(&m.Field2[i], &o.Field2[i]) } } if o.Field3 != nil { m.Field3 = make([]RepeatedScalarPacked, len(o.Field3)) for i := range m.Field3 { - github_com_docker_swarmkit_api_deepcopy.Copy(&m.Field3[i], &o.Field3[i]) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(&m.Field3[i], &o.Field3[i]) } } @@ -905,7 +905,7 @@ func (m *MapStruct) CopyFrom(src interface{}) { m.NullableMap = make(map[string]*BasicScalar, len(o.NullableMap)) for k, v := range o.NullableMap { m.NullableMap[k] = &BasicScalar{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.NullableMap[k], v) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.NullableMap[k], v) } } @@ -913,7 +913,7 @@ func (m *MapStruct) CopyFrom(src interface{}) { m.NonnullableMap = make(map[string]BasicScalar, len(o.NonnullableMap)) for k, v := range o.NonnullableMap { n := BasicScalar{} - github_com_docker_swarmkit_api_deepcopy.Copy(&n, &v) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(&n, &v) m.NonnullableMap[k] = n } } @@ -978,13 +978,13 @@ func (m *OneOf) CopyFrom(src interface{}) { v := OneOf_Field8{ Field8: &MapStruct{}, } - github_com_docker_swarmkit_api_deepcopy.Copy(v.Field8, o.GetField8()) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(v.Field8, o.GetField8()) m.Fields = &v case *OneOf_Field9: v := OneOf_Field9{ Field9: &RepeatedNonNullableExternalStruct{}, } - github_com_docker_swarmkit_api_deepcopy.Copy(v.Field9, o.GetField9()) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(v.Field9, o.GetField9()) m.Fields = &v } } @@ -995,13 +995,13 @@ func (m *OneOf) CopyFrom(src interface{}) { v := OneOf_Field10{ Field10: &NonNullableExternalStruct{}, } - github_com_docker_swarmkit_api_deepcopy.Copy(v.Field10, o.GetField10()) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(v.Field10, o.GetField10()) m.FieldsTwo = &v case *OneOf_Field11: v := OneOf_Field11{ Field11: &RepeatedExternalStruct{}, } - github_com_docker_swarmkit_api_deepcopy.Copy(v.Field11, o.GetField11()) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(v.Field11, o.GetField11()) m.FieldsTwo = &v } } diff --git a/protobuf/plugin/plugin.pb.go b/protobuf/plugin/plugin.pb.go index 1ff8cdc382..d947c8b530 100644 --- a/protobuf/plugin/plugin.pb.go +++ b/protobuf/plugin/plugin.pb.go @@ -5,10 +5,10 @@ package plugin import ( fmt "fmt" - github_com_docker_swarmkit_api_deepcopy "github.com/docker/swarmkit/api/deepcopy" github_com_gogo_protobuf_proto "github.com/gogo/protobuf/proto" proto "github.com/gogo/protobuf/proto" descriptor "github.com/gogo/protobuf/protoc-gen-gogo/descriptor" + github_com_moby_swarmkit_v2_api_deepcopy "github.com/moby/swarmkit/v2/api/deepcopy" io "io" math "math" math_bits "math/bits" @@ -267,7 +267,7 @@ func (m *StoreObject) CopyFrom(src interface{}) { *m = *o if o.WatchSelectors != nil { m.WatchSelectors = &WatchSelectors{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.WatchSelectors, o.WatchSelectors) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.WatchSelectors, o.WatchSelectors) } } diff --git a/protobuf/plugin/raftproxy/raftproxy.go b/protobuf/plugin/raftproxy/raftproxy.go index 0ff98817df..82cd0e14d3 100644 --- a/protobuf/plugin/raftproxy/raftproxy.go +++ b/protobuf/plugin/raftproxy/raftproxy.go @@ -377,7 +377,7 @@ func (g *raftProxyGen) GenerateImports(file *generator.FileDescriptor) { if len(file.Service) == 0 { return } - g.gen.PrintImport("raftselector", "github.com/docker/swarmkit/manager/raftselector") + g.gen.PrintImport("raftselector", "github.com/moby/swarmkit/v2/manager/raftselector") g.gen.PrintImport("codes", "google.golang.org/grpc/codes") g.gen.PrintImport("status", "google.golang.org/grpc/status") g.gen.PrintImport("metadata", "google.golang.org/grpc/metadata") diff --git a/protobuf/plugin/raftproxy/test/raftproxy_test.go b/protobuf/plugin/raftproxy/test/raftproxy_test.go index e0dfc9c22a..1dde5c25e3 100644 --- a/protobuf/plugin/raftproxy/test/raftproxy_test.go +++ b/protobuf/plugin/raftproxy/test/raftproxy_test.go @@ -6,7 +6,7 @@ import ( "testing" "time" - "github.com/docker/swarmkit/testutils" + "github.com/moby/swarmkit/v2/testutils" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/protobuf/plugin/raftproxy/test/service.pb.go b/protobuf/plugin/raftproxy/test/service.pb.go index ce24991199..4862cce719 100644 --- a/protobuf/plugin/raftproxy/test/service.pb.go +++ b/protobuf/plugin/raftproxy/test/service.pb.go @@ -6,9 +6,9 @@ package test import ( context "context" fmt "fmt" - github_com_docker_swarmkit_api_deepcopy "github.com/docker/swarmkit/api/deepcopy" - raftselector "github.com/docker/swarmkit/manager/raftselector" proto "github.com/gogo/protobuf/proto" + github_com_moby_swarmkit_v2_api_deepcopy "github.com/moby/swarmkit/v2/api/deepcopy" + raftselector "github.com/moby/swarmkit/v2/manager/raftselector" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" metadata "google.golang.org/grpc/metadata" @@ -483,11 +483,11 @@ func (m *Rectangle) CopyFrom(src interface{}) { *m = *o if o.Lo != nil { m.Lo = &Point{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Lo, o.Lo) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Lo, o.Lo) } if o.Hi != nil { m.Hi = &Point{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Hi, o.Hi) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Hi, o.Hi) } } @@ -506,7 +506,7 @@ func (m *Feature) CopyFrom(src interface{}) { *m = *o if o.Location != nil { m.Location = &Point{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Location, o.Location) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Location, o.Location) } } @@ -525,7 +525,7 @@ func (m *RouteNote) CopyFrom(src interface{}) { *m = *o if o.Location != nil { m.Location = &Point{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Location, o.Location) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Location, o.Location) } } diff --git a/protobuf/plugin/storeobject/storeobject.go b/protobuf/plugin/storeobject/storeobject.go index 6788c4824a..3d5a5e9a48 100644 --- a/protobuf/plugin/storeobject/storeobject.go +++ b/protobuf/plugin/storeobject/storeobject.go @@ -3,7 +3,7 @@ package storeobject import ( "strings" - "github.com/docker/swarmkit/protobuf/plugin" + "github.com/moby/swarmkit/v2/protobuf/plugin" "github.com/gogo/protobuf/proto" "github.com/gogo/protobuf/protoc-gen-gogo/generator" ) diff --git a/remotes/remotes.go b/remotes/remotes.go index e79ed3f326..c31e1abb49 100644 --- a/remotes/remotes.go +++ b/remotes/remotes.go @@ -7,7 +7,7 @@ import ( "sort" "sync" - "github.com/docker/swarmkit/api" + "github.com/moby/swarmkit/v2/api" ) var errRemotesUnavailable = fmt.Errorf("no remote hosts provided") diff --git a/remotes/remotes_test.go b/remotes/remotes_test.go index 08e2ae6dc6..03dcc0d19d 100644 --- a/remotes/remotes_test.go +++ b/remotes/remotes_test.go @@ -4,7 +4,7 @@ import ( "math" "testing" - "github.com/docker/swarmkit/api" + "github.com/moby/swarmkit/v2/api" ) func TestRemotesSimple(t *testing.T) { diff --git a/template/context.go b/template/context.go index 8485fc4628..b1d995e994 100644 --- a/template/context.go +++ b/template/context.go @@ -6,11 +6,11 @@ import ( "strings" "text/template" - "github.com/docker/swarmkit/agent/configs" - "github.com/docker/swarmkit/agent/exec" - "github.com/docker/swarmkit/agent/secrets" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/api/naming" + "github.com/moby/swarmkit/v2/agent/configs" + "github.com/moby/swarmkit/v2/agent/exec" + "github.com/moby/swarmkit/v2/agent/secrets" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/api/naming" "github.com/pkg/errors" ) diff --git a/template/context_test.go b/template/context_test.go index e760f34371..2e81a4b9cc 100644 --- a/template/context_test.go +++ b/template/context_test.go @@ -4,7 +4,7 @@ import ( "strings" "testing" - "github.com/docker/swarmkit/api" + "github.com/moby/swarmkit/v2/api" "github.com/stretchr/testify/assert" ) diff --git a/template/expand.go b/template/expand.go index 0957c25f20..13a7add036 100644 --- a/template/expand.go +++ b/template/expand.go @@ -4,8 +4,8 @@ import ( "fmt" "strings" - "github.com/docker/swarmkit/agent/exec" - "github.com/docker/swarmkit/api" + "github.com/moby/swarmkit/v2/agent/exec" + "github.com/moby/swarmkit/v2/api" "github.com/pkg/errors" ) diff --git a/template/getter.go b/template/getter.go index 41409c7400..e8344735db 100644 --- a/template/getter.go +++ b/template/getter.go @@ -1,8 +1,8 @@ package template import ( - "github.com/docker/swarmkit/agent/exec" - "github.com/docker/swarmkit/api" + "github.com/moby/swarmkit/v2/agent/exec" + "github.com/moby/swarmkit/v2/api" "github.com/pkg/errors" ) diff --git a/template/getter_test.go b/template/getter_test.go index 5fe6017a66..e92d1fa7c6 100644 --- a/template/getter_test.go +++ b/template/getter_test.go @@ -3,9 +3,9 @@ package template import ( "testing" - "github.com/docker/swarmkit/agent" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/testutils" + "github.com/moby/swarmkit/v2/agent" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/testutils" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/tools/go.mod b/tools/go.mod index a5b4964b3b..bd1c2497be 100644 --- a/tools/go.mod +++ b/tools/go.mod @@ -1,4 +1,4 @@ -module github.com/moby/moby/tools +module github.com/moby/swarmkit/v2/tools go 1.17 @@ -7,7 +7,8 @@ require github.com/containerd/protobuild v0.1.1-0.20211025221430-7e5ee24bc1f7 require ( github.com/golang/protobuf v1.5.0 // indirect github.com/pelletier/go-toml v1.8.1 // indirect + google.golang.org/protobuf v1.27.1 // indirect ) -// match ../vendor.mod -replace github.com/golang/protobuf => github.com/golang/protobuf v1.3.5 +// match ../go.mod +replace github.com/golang/protobuf => github.com/golang/protobuf v1.5.2 diff --git a/tools/go.sum b/tools/go.sum index 94f1c210e0..5192d0337d 100644 --- a/tools/go.sum +++ b/tools/go.sum @@ -12,9 +12,10 @@ github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1m github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= 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.3.5 h1:F768QJ1E9tib+q5Sc8MkdJi1RxLTbRcTf8LJV56aRls= -github.com/golang/protobuf v1.3.5/go.mod h1:6O5/vntMXwX2lRkT1hjjk0nAC1IDOTvTlVgjlRvqsdk= +github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw= +github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= +github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/pelletier/go-toml v1.8.1 h1:1Nf83orprkJyknT6h7zbuEGUEjcyVlCxSUGTENmNCRM= github.com/pelletier/go-toml v1.8.1/go.mod h1:T2/BmBdy8dvIRq1a/8aqjN41wvWlN4lrapLU/GW4pbc= @@ -47,6 +48,7 @@ golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3 golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/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= @@ -56,6 +58,8 @@ google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZi google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= google.golang.org/grpc v1.28.1/go.mod h1:rpkK4SK4GF4Ach/+MFLZUBavHOvF2JJB5uozKKal+60= +google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= +google.golang.org/protobuf v1.27.1 h1:SnqbnDw1V7RiZcXPx5MEeqPv2s79L9i7BJUlG/+RurQ= google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= 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= diff --git a/vendor/github.com/containerd/containerd/LICENSE b/vendor/github.com/containerd/containerd/LICENSE deleted file mode 100644 index 584149b6ee..0000000000 --- a/vendor/github.com/containerd/containerd/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 The containerd Authors - - 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/vendor/github.com/containerd/containerd/NOTICE b/vendor/github.com/containerd/containerd/NOTICE deleted file mode 100644 index 8915f02773..0000000000 --- a/vendor/github.com/containerd/containerd/NOTICE +++ /dev/null @@ -1,16 +0,0 @@ -Docker -Copyright 2012-2015 Docker, Inc. - -This product includes software developed at Docker, Inc. (https://www.docker.com). - -The following is courtesy of our legal counsel: - - -Use and transfer of Docker may be subject to certain restrictions by the -United States and other governments. -It is your responsibility to ensure that your use and/or transfer does not -violate applicable laws. - -For more information, please see https://www.bis.doc.gov - -See also https://www.apache.org/dev/crypto.html and/or seek legal counsel. diff --git a/vendor/github.com/containerd/containerd/errdefs/errors.go b/vendor/github.com/containerd/containerd/errdefs/errors.go deleted file mode 100644 index 05a35228ca..0000000000 --- a/vendor/github.com/containerd/containerd/errdefs/errors.go +++ /dev/null @@ -1,93 +0,0 @@ -/* - Copyright The containerd Authors. - - 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 errdefs defines the common errors used throughout containerd -// packages. -// -// Use with errors.Wrap and error.Wrapf to add context to an error. -// -// To detect an error class, use the IsXXX functions to tell whether an error -// is of a certain type. -// -// The functions ToGRPC and FromGRPC can be used to map server-side and -// client-side errors to the correct types. -package errdefs - -import ( - "context" - - "github.com/pkg/errors" -) - -// Definitions of common error types used throughout containerd. All containerd -// errors returned by most packages will map into one of these errors classes. -// Packages should return errors of these types when they want to instruct a -// client to take a particular action. -// -// For the most part, we just try to provide local grpc errors. Most conditions -// map very well to those defined by grpc. -var ( - ErrUnknown = errors.New("unknown") // used internally to represent a missed mapping. - ErrInvalidArgument = errors.New("invalid argument") - ErrNotFound = errors.New("not found") - ErrAlreadyExists = errors.New("already exists") - ErrFailedPrecondition = errors.New("failed precondition") - ErrUnavailable = errors.New("unavailable") - ErrNotImplemented = errors.New("not implemented") // represents not supported and unimplemented -) - -// IsInvalidArgument returns true if the error is due to an invalid argument -func IsInvalidArgument(err error) bool { - return errors.Is(err, ErrInvalidArgument) -} - -// IsNotFound returns true if the error is due to a missing object -func IsNotFound(err error) bool { - return errors.Is(err, ErrNotFound) -} - -// IsAlreadyExists returns true if the error is due to an already existing -// metadata item -func IsAlreadyExists(err error) bool { - return errors.Is(err, ErrAlreadyExists) -} - -// IsFailedPrecondition returns true if an operation could not proceed to the -// lack of a particular condition -func IsFailedPrecondition(err error) bool { - return errors.Is(err, ErrFailedPrecondition) -} - -// IsUnavailable returns true if the error is due to a resource being unavailable -func IsUnavailable(err error) bool { - return errors.Is(err, ErrUnavailable) -} - -// IsNotImplemented returns true if the error is due to not being implemented -func IsNotImplemented(err error) bool { - return errors.Is(err, ErrNotImplemented) -} - -// IsCanceled returns true if the error is due to `context.Canceled`. -func IsCanceled(err error) bool { - return errors.Is(err, context.Canceled) -} - -// IsDeadlineExceeded returns true if the error is due to -// `context.DeadlineExceeded`. -func IsDeadlineExceeded(err error) bool { - return errors.Is(err, context.DeadlineExceeded) -} diff --git a/vendor/github.com/containerd/containerd/errdefs/grpc.go b/vendor/github.com/containerd/containerd/errdefs/grpc.go deleted file mode 100644 index 209f63bd0f..0000000000 --- a/vendor/github.com/containerd/containerd/errdefs/grpc.go +++ /dev/null @@ -1,147 +0,0 @@ -/* - Copyright The containerd Authors. - - 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 errdefs - -import ( - "context" - "strings" - - "github.com/pkg/errors" - "google.golang.org/grpc/codes" - "google.golang.org/grpc/status" -) - -// ToGRPC will attempt to map the backend containerd error into a grpc error, -// using the original error message as a description. -// -// Further information may be extracted from certain errors depending on their -// type. -// -// If the error is unmapped, the original error will be returned to be handled -// by the regular grpc error handling stack. -func ToGRPC(err error) error { - if err == nil { - return nil - } - - if isGRPCError(err) { - // error has already been mapped to grpc - return err - } - - switch { - case IsInvalidArgument(err): - return status.Errorf(codes.InvalidArgument, err.Error()) - case IsNotFound(err): - return status.Errorf(codes.NotFound, err.Error()) - case IsAlreadyExists(err): - return status.Errorf(codes.AlreadyExists, err.Error()) - case IsFailedPrecondition(err): - return status.Errorf(codes.FailedPrecondition, err.Error()) - case IsUnavailable(err): - return status.Errorf(codes.Unavailable, err.Error()) - case IsNotImplemented(err): - return status.Errorf(codes.Unimplemented, err.Error()) - case IsCanceled(err): - return status.Errorf(codes.Canceled, err.Error()) - case IsDeadlineExceeded(err): - return status.Errorf(codes.DeadlineExceeded, err.Error()) - } - - return err -} - -// ToGRPCf maps the error to grpc error codes, assembling the formatting string -// and combining it with the target error string. -// -// This is equivalent to errors.ToGRPC(errors.Wrapf(err, format, args...)) -func ToGRPCf(err error, format string, args ...interface{}) error { - return ToGRPC(errors.Wrapf(err, format, args...)) -} - -// FromGRPC returns the underlying error from a grpc service based on the grpc error code -func FromGRPC(err error) error { - if err == nil { - return nil - } - - var cls error // divide these into error classes, becomes the cause - - switch code(err) { - case codes.InvalidArgument: - cls = ErrInvalidArgument - case codes.AlreadyExists: - cls = ErrAlreadyExists - case codes.NotFound: - cls = ErrNotFound - case codes.Unavailable: - cls = ErrUnavailable - case codes.FailedPrecondition: - cls = ErrFailedPrecondition - case codes.Unimplemented: - cls = ErrNotImplemented - case codes.Canceled: - cls = context.Canceled - case codes.DeadlineExceeded: - cls = context.DeadlineExceeded - default: - cls = ErrUnknown - } - - msg := rebaseMessage(cls, err) - if msg != "" { - err = errors.Wrap(cls, msg) - } else { - err = errors.WithStack(cls) - } - - return err -} - -// rebaseMessage removes the repeats for an error at the end of an error -// string. This will happen when taking an error over grpc then remapping it. -// -// Effectively, we just remove the string of cls from the end of err if it -// appears there. -func rebaseMessage(cls error, err error) string { - desc := errDesc(err) - clss := cls.Error() - if desc == clss { - return "" - } - - return strings.TrimSuffix(desc, ": "+clss) -} - -func isGRPCError(err error) bool { - _, ok := status.FromError(err) - return ok -} - -func code(err error) codes.Code { - if s, ok := status.FromError(err); ok { - return s.Code() - } - return codes.Unknown -} - -func errDesc(err error) string { - if s, ok := status.FromError(err); ok { - return s.Message() - } - return err.Error() -} diff --git a/vendor/github.com/docker/distribution/registry/api/errcode/errors.go b/vendor/github.com/docker/distribution/registry/api/errcode/errors.go deleted file mode 100644 index 6d9bb4b62a..0000000000 --- a/vendor/github.com/docker/distribution/registry/api/errcode/errors.go +++ /dev/null @@ -1,267 +0,0 @@ -package errcode - -import ( - "encoding/json" - "fmt" - "strings" -) - -// ErrorCoder is the base interface for ErrorCode and Error allowing -// users of each to just call ErrorCode to get the real ID of each -type ErrorCoder interface { - ErrorCode() ErrorCode -} - -// ErrorCode represents the error type. The errors are serialized via strings -// and the integer format may change and should *never* be exported. -type ErrorCode int - -var _ error = ErrorCode(0) - -// ErrorCode just returns itself -func (ec ErrorCode) ErrorCode() ErrorCode { - return ec -} - -// Error returns the ID/Value -func (ec ErrorCode) Error() string { - // NOTE(stevvooe): Cannot use message here since it may have unpopulated args. - return strings.ToLower(strings.Replace(ec.String(), "_", " ", -1)) -} - -// Descriptor returns the descriptor for the error code. -func (ec ErrorCode) Descriptor() ErrorDescriptor { - d, ok := errorCodeToDescriptors[ec] - - if !ok { - return ErrorCodeUnknown.Descriptor() - } - - return d -} - -// String returns the canonical identifier for this error code. -func (ec ErrorCode) String() string { - return ec.Descriptor().Value -} - -// Message returned the human-readable error message for this error code. -func (ec ErrorCode) Message() string { - return ec.Descriptor().Message -} - -// MarshalText encodes the receiver into UTF-8-encoded text and returns the -// result. -func (ec ErrorCode) MarshalText() (text []byte, err error) { - return []byte(ec.String()), nil -} - -// UnmarshalText decodes the form generated by MarshalText. -func (ec *ErrorCode) UnmarshalText(text []byte) error { - desc, ok := idToDescriptors[string(text)] - - if !ok { - desc = ErrorCodeUnknown.Descriptor() - } - - *ec = desc.Code - - return nil -} - -// WithMessage creates a new Error struct based on the passed-in info and -// overrides the Message property. -func (ec ErrorCode) WithMessage(message string) Error { - return Error{ - Code: ec, - Message: message, - } -} - -// WithDetail creates a new Error struct based on the passed-in info and -// set the Detail property appropriately -func (ec ErrorCode) WithDetail(detail interface{}) Error { - return Error{ - Code: ec, - Message: ec.Message(), - }.WithDetail(detail) -} - -// WithArgs creates a new Error struct and sets the Args slice -func (ec ErrorCode) WithArgs(args ...interface{}) Error { - return Error{ - Code: ec, - Message: ec.Message(), - }.WithArgs(args...) -} - -// Error provides a wrapper around ErrorCode with extra Details provided. -type Error struct { - Code ErrorCode `json:"code"` - Message string `json:"message"` - Detail interface{} `json:"detail,omitempty"` - - // TODO(duglin): See if we need an "args" property so we can do the - // variable substitution right before showing the message to the user -} - -var _ error = Error{} - -// ErrorCode returns the ID/Value of this Error -func (e Error) ErrorCode() ErrorCode { - return e.Code -} - -// Error returns a human readable representation of the error. -func (e Error) Error() string { - return fmt.Sprintf("%s: %s", e.Code.Error(), e.Message) -} - -// WithDetail will return a new Error, based on the current one, but with -// some Detail info added -func (e Error) WithDetail(detail interface{}) Error { - return Error{ - Code: e.Code, - Message: e.Message, - Detail: detail, - } -} - -// WithArgs uses the passed-in list of interface{} as the substitution -// variables in the Error's Message string, but returns a new Error -func (e Error) WithArgs(args ...interface{}) Error { - return Error{ - Code: e.Code, - Message: fmt.Sprintf(e.Code.Message(), args...), - Detail: e.Detail, - } -} - -// ErrorDescriptor provides relevant information about a given error code. -type ErrorDescriptor struct { - // Code is the error code that this descriptor describes. - Code ErrorCode - - // Value provides a unique, string key, often captilized with - // underscores, to identify the error code. This value is used as the - // keyed value when serializing api errors. - Value string - - // Message is a short, human readable decription of the error condition - // included in API responses. - Message string - - // Description provides a complete account of the errors purpose, suitable - // for use in documentation. - Description string - - // HTTPStatusCode provides the http status code that is associated with - // this error condition. - HTTPStatusCode int -} - -// ParseErrorCode returns the value by the string error code. -// `ErrorCodeUnknown` will be returned if the error is not known. -func ParseErrorCode(value string) ErrorCode { - ed, ok := idToDescriptors[value] - if ok { - return ed.Code - } - - return ErrorCodeUnknown -} - -// Errors provides the envelope for multiple errors and a few sugar methods -// for use within the application. -type Errors []error - -var _ error = Errors{} - -func (errs Errors) Error() string { - switch len(errs) { - case 0: - return "" - case 1: - return errs[0].Error() - default: - msg := "errors:\n" - for _, err := range errs { - msg += err.Error() + "\n" - } - return msg - } -} - -// Len returns the current number of errors. -func (errs Errors) Len() int { - return len(errs) -} - -// MarshalJSON converts slice of error, ErrorCode or Error into a -// slice of Error - then serializes -func (errs Errors) MarshalJSON() ([]byte, error) { - var tmpErrs struct { - Errors []Error `json:"errors,omitempty"` - } - - for _, daErr := range errs { - var err Error - - switch daErr.(type) { - case ErrorCode: - err = daErr.(ErrorCode).WithDetail(nil) - case Error: - err = daErr.(Error) - default: - err = ErrorCodeUnknown.WithDetail(daErr) - - } - - // If the Error struct was setup and they forgot to set the - // Message field (meaning its "") then grab it from the ErrCode - msg := err.Message - if msg == "" { - msg = err.Code.Message() - } - - tmpErrs.Errors = append(tmpErrs.Errors, Error{ - Code: err.Code, - Message: msg, - Detail: err.Detail, - }) - } - - return json.Marshal(tmpErrs) -} - -// UnmarshalJSON deserializes []Error and then converts it into slice of -// Error or ErrorCode -func (errs *Errors) UnmarshalJSON(data []byte) error { - var tmpErrs struct { - Errors []Error - } - - if err := json.Unmarshal(data, &tmpErrs); err != nil { - return err - } - - var newErrs Errors - for _, daErr := range tmpErrs.Errors { - // If Message is empty or exactly matches the Code's message string - // then just use the Code, no need for a full Error struct - if daErr.Detail == nil && (daErr.Message == "" || daErr.Message == daErr.Code.Message()) { - // Error's w/o details get converted to ErrorCode - newErrs = append(newErrs, daErr.Code) - } else { - // Error's w/ details are untouched - newErrs = append(newErrs, Error{ - Code: daErr.Code, - Message: daErr.Message, - Detail: daErr.Detail, - }) - } - } - - *errs = newErrs - return nil -} diff --git a/vendor/github.com/docker/distribution/registry/api/errcode/handler.go b/vendor/github.com/docker/distribution/registry/api/errcode/handler.go deleted file mode 100644 index d77e70473e..0000000000 --- a/vendor/github.com/docker/distribution/registry/api/errcode/handler.go +++ /dev/null @@ -1,40 +0,0 @@ -package errcode - -import ( - "encoding/json" - "net/http" -) - -// ServeJSON attempts to serve the errcode in a JSON envelope. It marshals err -// and sets the content-type header to 'application/json'. It will handle -// ErrorCoder and Errors, and if necessary will create an envelope. -func ServeJSON(w http.ResponseWriter, err error) error { - w.Header().Set("Content-Type", "application/json; charset=utf-8") - var sc int - - switch errs := err.(type) { - case Errors: - if len(errs) < 1 { - break - } - - if err, ok := errs[0].(ErrorCoder); ok { - sc = err.ErrorCode().Descriptor().HTTPStatusCode - } - case ErrorCoder: - sc = errs.ErrorCode().Descriptor().HTTPStatusCode - err = Errors{err} // create an envelope. - default: - // We just have an unhandled error type, so just place in an envelope - // and move along. - err = Errors{err} - } - - if sc == 0 { - sc = http.StatusInternalServerError - } - - w.WriteHeader(sc) - - return json.NewEncoder(w).Encode(err) -} diff --git a/vendor/github.com/docker/distribution/registry/api/errcode/register.go b/vendor/github.com/docker/distribution/registry/api/errcode/register.go deleted file mode 100644 index d1e8826c6d..0000000000 --- a/vendor/github.com/docker/distribution/registry/api/errcode/register.go +++ /dev/null @@ -1,138 +0,0 @@ -package errcode - -import ( - "fmt" - "net/http" - "sort" - "sync" -) - -var ( - errorCodeToDescriptors = map[ErrorCode]ErrorDescriptor{} - idToDescriptors = map[string]ErrorDescriptor{} - groupToDescriptors = map[string][]ErrorDescriptor{} -) - -var ( - // ErrorCodeUnknown is a generic error that can be used as a last - // resort if there is no situation-specific error message that can be used - ErrorCodeUnknown = Register("errcode", ErrorDescriptor{ - Value: "UNKNOWN", - Message: "unknown error", - Description: `Generic error returned when the error does not have an - API classification.`, - HTTPStatusCode: http.StatusInternalServerError, - }) - - // ErrorCodeUnsupported is returned when an operation is not supported. - ErrorCodeUnsupported = Register("errcode", ErrorDescriptor{ - Value: "UNSUPPORTED", - Message: "The operation is unsupported.", - Description: `The operation was unsupported due to a missing - implementation or invalid set of parameters.`, - HTTPStatusCode: http.StatusMethodNotAllowed, - }) - - // ErrorCodeUnauthorized is returned if a request requires - // authentication. - ErrorCodeUnauthorized = Register("errcode", ErrorDescriptor{ - Value: "UNAUTHORIZED", - Message: "authentication required", - Description: `The access controller was unable to authenticate - the client. Often this will be accompanied by a - Www-Authenticate HTTP response header indicating how to - authenticate.`, - HTTPStatusCode: http.StatusUnauthorized, - }) - - // ErrorCodeDenied is returned if a client does not have sufficient - // permission to perform an action. - ErrorCodeDenied = Register("errcode", ErrorDescriptor{ - Value: "DENIED", - Message: "requested access to the resource is denied", - Description: `The access controller denied access for the - operation on a resource.`, - HTTPStatusCode: http.StatusForbidden, - }) - - // ErrorCodeUnavailable provides a common error to report unavailability - // of a service or endpoint. - ErrorCodeUnavailable = Register("errcode", ErrorDescriptor{ - Value: "UNAVAILABLE", - Message: "service unavailable", - Description: "Returned when a service is not available", - HTTPStatusCode: http.StatusServiceUnavailable, - }) - - // ErrorCodeTooManyRequests is returned if a client attempts too many - // times to contact a service endpoint. - ErrorCodeTooManyRequests = Register("errcode", ErrorDescriptor{ - Value: "TOOMANYREQUESTS", - Message: "too many requests", - Description: `Returned when a client attempts to contact a - service too many times`, - HTTPStatusCode: http.StatusTooManyRequests, - }) -) - -var nextCode = 1000 -var registerLock sync.Mutex - -// Register will make the passed-in error known to the environment and -// return a new ErrorCode -func Register(group string, descriptor ErrorDescriptor) ErrorCode { - registerLock.Lock() - defer registerLock.Unlock() - - descriptor.Code = ErrorCode(nextCode) - - if _, ok := idToDescriptors[descriptor.Value]; ok { - panic(fmt.Sprintf("ErrorValue %q is already registered", descriptor.Value)) - } - if _, ok := errorCodeToDescriptors[descriptor.Code]; ok { - panic(fmt.Sprintf("ErrorCode %v is already registered", descriptor.Code)) - } - - groupToDescriptors[group] = append(groupToDescriptors[group], descriptor) - errorCodeToDescriptors[descriptor.Code] = descriptor - idToDescriptors[descriptor.Value] = descriptor - - nextCode++ - return descriptor.Code -} - -type byValue []ErrorDescriptor - -func (a byValue) Len() int { return len(a) } -func (a byValue) Swap(i, j int) { a[i], a[j] = a[j], a[i] } -func (a byValue) Less(i, j int) bool { return a[i].Value < a[j].Value } - -// GetGroupNames returns the list of Error group names that are registered -func GetGroupNames() []string { - keys := []string{} - - for k := range groupToDescriptors { - keys = append(keys, k) - } - sort.Strings(keys) - return keys -} - -// GetErrorCodeGroup returns the named group of error descriptors -func GetErrorCodeGroup(name string) []ErrorDescriptor { - desc := groupToDescriptors[name] - sort.Sort(byValue(desc)) - return desc -} - -// GetErrorAllDescriptors returns a slice of all ErrorDescriptors that are -// registered, irrespective of what group they're in -func GetErrorAllDescriptors() []ErrorDescriptor { - result := []ErrorDescriptor{} - - for _, group := range GetGroupNames() { - result = append(result, GetErrorCodeGroup(group)...) - } - sort.Sort(byValue(result)) - return result -} diff --git a/vendor/github.com/docker/docker/AUTHORS b/vendor/github.com/docker/docker/AUTHORS index 2ae76d2c2c..b0362e77c0 100644 --- a/vendor/github.com/docker/docker/AUTHORS +++ b/vendor/github.com/docker/docker/AUTHORS @@ -7,7 +7,7 @@ Aaron Feng Aaron Hnatiw Aaron Huslage Aaron L. Xu -Aaron Lehmann +Aaron Lehmann Aaron Welch Aaron.L.Xu Abel Muiño @@ -61,10 +61,11 @@ Alan Scherger Alan Thompson Albert Callarisa Albert Zhang -Albin Kerouanton +Albin Kerouanton Alec Benson Alejandro González Hevia Aleksa Sarai +Aleksandr Chebotov Aleksandrs Fadins Alena Prokharchyk Alessandro Boch @@ -76,6 +77,7 @@ Alex Crawford Alex Ellis Alex Gaynor Alex Goodman +Alex Nordlund Alex Olshansky Alex Samorukov Alex Warhawk @@ -83,7 +85,7 @@ Alexander Artemenko Alexander Boyd Alexander Larsson Alexander Midlash -Alexander Morozov +Alexander Morozov Alexander Polakov Alexander Shopov Alexandre Beslic @@ -192,13 +194,15 @@ Antony Messerli Anuj Bahuguna Anuj Varma Anusha Ragunathan +Anyu Wang apocas Arash Deshmeh ArikaChen -Arko Dasgupta +Arko Dasgupta Arnaud Lefebvre -Arnaud Porterie +Arnaud Porterie Arnaud Rebillout +Artem Khramov Arthur Barr Arthur Gautier Artur Meyster @@ -343,6 +347,7 @@ Chen Qiu Cheng-mean Liu Chengfei Shang Chengguang Xu +Chenyang Yan chenyuzhu Chetan Birajdar Chewey @@ -406,20 +411,23 @@ Colin Walters Collin Guarino Colm Hally companycy +Conor Evans Corbin Coleman Corey Farrell Cory Forsyth +Cory Snider cressie176 -CrimsonGlory Cristian Ariza Cristian Staretu cristiano balducci Cristina Yenyxe Gonzalez Garcia Cruceru Calin-Cristian CUI Wei +cuishuang Cuong Manh Le Cyprian Gracz Cyril F +Da McGrady Daan van Berkel Daehyeok Mun Dafydd Crosby @@ -437,6 +445,7 @@ Dan Hirsch Dan Keder Dan Levy Dan McPherson +Dan Plamadeala Dan Stine Dan Williams Dani Hodovic @@ -457,6 +466,7 @@ Daniel Mizyrycki Daniel Nephin Daniel Norberg Daniel Nordberg +Daniel P. Berrangé Daniel Robinson Daniel S Daniel Sweet @@ -465,6 +475,7 @@ Daniel Watkins Daniel X Moore Daniel YC Lin Daniel Zhang +Daniele Rondina Danny Berger Danny Milosavljevic Danny Yates @@ -530,7 +541,7 @@ Dennis Docter Derek Derek Derek Ch -Derek McGowan +Derek McGowan Deric Crago Deshi Xiao devmeyster @@ -550,9 +561,11 @@ Dimitris Rozakis Dimitry Andric Dinesh Subhraveti Ding Fei +dingwei Diogo Monica DiuDiugirl Djibril Koné +Djordje Lukic dkumor Dmitri Logvinenko Dmitri Shuralyov @@ -601,6 +614,7 @@ Elango Sivanandam Elena Morozova Eli Uriegas Elias Faxö +Elias Koromilas Elias Probst Elijah Zupancic eluck @@ -610,6 +624,7 @@ Emil Hernvall Emily Maier Emily Rose Emir Ozer +Eng Zer Jun Enguerran Eohyung Lee epeterso @@ -724,11 +739,14 @@ Frederik Loeffert Frederik Nordahl Jul Sabroe Freek Kalter Frieder Bluemle +frobnicaty <92033765+frobnicaty@users.noreply.github.com> +Frédéric Dalleau Fu JinLin Félix Baylac-Jacqué Félix Cantournet Gabe Rosenhouse Gabor Nagy +Gabriel Goller Gabriel L. Somlo Gabriel Linder Gabriel Monroy @@ -751,6 +769,7 @@ George Kontridze George MacRorie George Xie Georgi Hristozov +Georgy Yakovlev Gereon Frey German DZ Gert van Valkenhoef @@ -762,6 +781,7 @@ Gildas Cuisinier Giovan Isa Musthofa gissehel Giuseppe Mazzotta +Giuseppe Scrivano Gleb Fotengauer-Malinovskiy Gleb M Borisov Glyn Normington @@ -785,6 +805,7 @@ Guilherme Salgado Guillaume Dufour Guillaume J. Charmes Gunadhya S. <6939749+gunadhya@users.noreply.github.com> +Guoqiang QI guoxiuyan Guri Gurjeet Singh @@ -794,6 +815,7 @@ gwx296173 Günter Zöchbauer Haichao Yang haikuoliu +haining.cao Hakan Özler Hamish Hutchings Hannes Ljungberg @@ -889,6 +911,7 @@ Jake Champlin Jake Moshenko Jake Sanders Jakub Drahos +Jakub Guzik James Allen James Carey James Carr @@ -900,6 +923,7 @@ James Lal James Mills James Nesbitt James Nugent +James Sanders James Turnbull James Watkins-Harvey Jamie Hannaford @@ -932,6 +956,7 @@ Jason Shepherd Jason Smith Jason Sommer Jason Stangroome +Javier Bassi jaxgeller Jay Jay @@ -1100,6 +1125,7 @@ Justas Brazauskas Justen Martin Justin Cormack Justin Force +Justin Keller <85903732+jk-vb@users.noreply.github.com> Justin Menga Justin Plock Justin Simonelis @@ -1148,6 +1174,7 @@ Kenjiro Nakayama Kent Johnson Kenta Tada Kevin "qwazerty" Houdebert +Kevin Alvarez Kevin Burke Kevin Clark Kevin Feyrer @@ -1332,6 +1359,7 @@ Markus Fix Markus Kortlang Martijn Dwars Martijn van Oosterhout +Martin Dojcak Martin Honermeyer Martin Kelly Martin Mosegaard Amdisen @@ -1348,6 +1376,7 @@ Mathias Monnerville Mathieu Champlon Mathieu Le Marec - Pasquet Mathieu Parent +Mathieu Paturel Matt Apperson Matt Bachmann Matt Bajor @@ -1356,6 +1385,7 @@ Matt Haggard Matt Hoyle Matt McCormick Matt Moore +Matt Morrison <3maven@gmail.com> Matt Richardson Matt Rickard Matt Robenolt @@ -1400,7 +1430,7 @@ Michael Beskin Michael Bridgen Michael Brown Michael Chiang -Michael Crosby +Michael Crosby Michael Currie Michael Friis Michael Gorsuch @@ -1409,6 +1439,7 @@ Michael Holzheu Michael Hudson-Doyle Michael Huettermann Michael Irwin +Michael Kuehn Michael Käufl Michael Neale Michael Nussbaum @@ -1418,6 +1449,7 @@ Michael Spetsiotis Michael Stapelberg Michael Steinert Michael Thies +Michael Weidmann Michael West Michael Zhao Michal Fojtik @@ -1458,6 +1490,7 @@ Mike Snitzer mikelinjie <294893458@qq.com> Mikhail Sobolev Miklos Szegedi +Milas Bowman Milind Chawre Miloslav Trmač mingqing @@ -1533,6 +1566,7 @@ Nicolas Kaiser Nicolas Sterchele Nicolas V Castet Nicolás Hock Isaza +Niel Drummond Nigel Poulton Nik Nyby Nikhil Chawla @@ -1621,6 +1655,7 @@ Peng Tao Penghan Wang Per Weijnitz perhapszzy@sina.com +Pete Woods Peter Bourgon Peter Braden Peter Bücker @@ -1638,7 +1673,7 @@ Peter Waller Petr Švihlík Petros Angelatos Phil -Phil Estes +Phil Estes Phil Spitler Philip Alexander Etling Philip Monroe @@ -1707,6 +1742,7 @@ Renaud Gaubert Rhys Hiltner Ri Xu Ricardo N Feliciano +Rich Horwood Rich Moyse Rich Seymour Richard @@ -1731,6 +1767,7 @@ Robert Bachmann Robert Bittle Robert Obryk Robert Schneider +Robert Shade Robert Stern Robert Terhaar Robert Wallis @@ -1743,6 +1780,7 @@ Robin Speekenbrink Robin Thoni robpc Rodolfo Carvalho +Rodrigo Campos Rodrigo Vaz Roel Van Nyen Roger Peppe @@ -1757,6 +1795,8 @@ Roma Sokolov Roman Dudin Roman Mazur Roman Strashkin +Roman Volosatovs +Roman Zabaluev Ron Smits Ron Williams Rong Gao @@ -1790,6 +1830,7 @@ Ryan Liu Ryan McLaughlin Ryan O'Donnell Ryan Seto +Ryan Shea Ryan Simmen Ryan Stelly Ryan Thomas @@ -1824,6 +1865,7 @@ Samuel Andaya Samuel Dion-Girardeau Samuel Karp Samuel PHAN +sanchayanghosh Sandeep Bansal Sankar சங்கர் Sanket Saurav @@ -1881,6 +1923,7 @@ Shengbo Song Shengjing Zhu Shev Yan Shih-Yuan Lee +Shihao Xia Shijiang Wei Shijun Qin Shishir Mahajan @@ -1933,6 +1976,7 @@ Stefan S. Stefan Scherer Stefan Staudenmeyer Stefan Weil +Steffen Butzer Stephan Spindler Stephen Benjamin Stephen Crosby @@ -1951,6 +1995,7 @@ Steven Iveson Steven Merrill Steven Richards Steven Taylor +Stéphane Este-Gracias Stig Larsson Su Wang Subhajit Ghosh @@ -1962,12 +2007,13 @@ Sunny Gogoi Suryakumar Sudar Sven Dowideit Swapnil Daingade -Sylvain Baubeau +Sylvain Baubeau Sylvain Bellemare Sébastien Sébastien HOUZÉ Sébastien Luttringer Sébastien Stormacq +Sören Tempel Tabakhase Tadej Janež TAGOMORI Satoshi @@ -1996,6 +2042,7 @@ Thomas Gazagnaire Thomas Graf Thomas Grainger Thomas Hansen +Thomas Ledos Thomas Leonard Thomas Léveil Thomas Orozco @@ -2064,9 +2111,11 @@ Tomas Tomecek Tomasz Kopczynski Tomasz Lipinski Tomasz Nurkiewicz +Tomek Mańko Tommaso Visconti Tomoya Tabuchi Tomáš Hrčka +tonic Tonny Xu Tony Abboud Tony Daws @@ -2196,6 +2245,7 @@ Wolfgang Powisch Wonjun Kim WuLonghui xamyzhao +Xia Wu Xian Chaobo Xianglin Gao Xianjie @@ -2220,6 +2270,7 @@ Xuecong Liao xuzhaokui Yadnyawalkya Tale Yahya +yalpul YAMADA Tsuyoshi Yamasaki Masahide Yan Feng @@ -2254,6 +2305,7 @@ Yu-Ju Hong Yuan Sun Yuanhong Peng Yue Zhang +Yufei Xiong Yuhao Fang Yuichiro Kaneko YujiOshima diff --git a/vendor/github.com/docker/docker/api/swagger.yaml b/vendor/github.com/docker/docker/api/swagger.yaml index 46505d06c0..f0e463bd16 100644 --- a/vendor/github.com/docker/docker/api/swagger.yaml +++ b/vendor/github.com/docker/docker/api/swagger.yaml @@ -202,24 +202,72 @@ definitions: MountPoint: type: "object" - description: "A mount point inside a container" + description: | + MountPoint represents a mount point configuration inside the container. + This is used for reporting the mountpoints in use by a container. properties: Type: + description: | + The mount type: + + - `bind` a mount of a file or directory from the host into the container. + - `volume` a docker volume with the given `Name`. + - `tmpfs` a `tmpfs`. + - `npipe` a named pipe from the host into the container. type: "string" + enum: + - "bind" + - "volume" + - "tmpfs" + - "npipe" + example: "volume" Name: + description: | + Name is the name reference to the underlying data defined by `Source` + e.g., the volume name. type: "string" + example: "myvolume" Source: + description: | + Source location of the mount. + + For volumes, this contains the storage location of the volume (within + `/var/lib/docker/volumes/`). For bind-mounts, and `npipe`, this contains + the source (host) part of the bind-mount. For `tmpfs` mount points, this + field is empty. type: "string" + example: "/var/lib/docker/volumes/myvolume/_data" Destination: + description: | + Destination is the path relative to the container root (`/`) where + the `Source` is mounted inside the container. type: "string" + example: "/usr/share/nginx/html/" Driver: + description: | + Driver is the volume driver used to create the volume (if it is a volume). type: "string" + example: "local" Mode: + description: | + Mode is a comma separated list of options supplied by the user when + creating the bind/volume mount. + + The default is platform-specific (`"z"` on Linux, empty on Windows). type: "string" + example: "z" RW: + description: | + Whether the mount is mounted writable (read-write). type: "boolean" + example: true Propagation: + description: | + Propagation describes how mounts are propagated from the host into the + mount point, and vice-versa. Refer to the [Linux kernel documentation](https://www.kernel.org/doc/Documentation/filesystems/sharedsubtree.txt) + for details. This field is not used on Windows. type: "string" + example: "" DeviceMapping: type: "object" @@ -529,19 +577,13 @@ definitions: type: "array" items: $ref: "#/definitions/DeviceRequest" - KernelMemory: + KernelMemoryTCP: description: | - Kernel memory limit in bytes. - -


+ Hard limit for kernel TCP buffer memory (in bytes). Depending on the + OCI runtime in use, this option may be ignored. It is no longer supported + by the default (runc) runtime. - > **Deprecated**: This field is deprecated as the kernel 5.4 deprecated - > `kmem.limit_in_bytes`. - type: "integer" - format: "int64" - example: 209715200 - KernelMemoryTCP: - description: "Hard limit for kernel TCP buffer memory (in bytes)." + This field is omitted when empty. type: "integer" format: "int64" MemoryReservation: @@ -1027,8 +1069,9 @@ definitions: description: "Mount the container's root filesystem as read only." SecurityOpt: type: "array" - description: "A list of string values to customize labels for MLS - systems, such as SELinux." + description: | + A list of string values to customize labels for MLS systems, such + as SELinux. items: type: "string" StorageOpt: @@ -1109,14 +1152,18 @@ definitions: type: "string" ContainerConfig: - description: "Configuration for a container that is portable between hosts" + description: | + Configuration for a container that is portable between hosts. type: "object" properties: Hostname: - description: "The hostname to use for the container, as a valid RFC 1123 hostname." + description: | + The hostname to use for the container, as a valid RFC 1123 hostname. type: "string" + example: "439f4e91bd1d" Domainname: - description: "The domain name to use for the container." + description: | + The domain name to use for the container. type: "string" User: description: "The user that commands are run as inside the container." @@ -1139,11 +1186,16 @@ definitions: `{"/": {}}` type: "object" + x-nullable: true additionalProperties: type: "object" enum: - {} default: {} + example: { + "80/tcp": {}, + "443/tcp": {} + } Tty: description: | Attach standard streams to a TTY, including `stdin` if it is not closed. @@ -1165,21 +1217,29 @@ definitions: type: "array" items: type: "string" + example: + - "PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" Cmd: description: | Command to run specified as a string or an array of strings. type: "array" items: type: "string" + example: ["/bin/sh"] Healthcheck: $ref: "#/definitions/HealthConfig" ArgsEscaped: description: "Command is already escaped (Windows only)" type: "boolean" + default: false + example: false + x-nullable: true Image: description: | - The name of the image to use when creating the container/ + The name (or reference) of the image to use when creating the container, + or which was used when the container was created. type: "string" + example: "example-image:1.0" Volumes: description: | An object mapping mount point paths inside the container to empty @@ -1193,6 +1253,7 @@ definitions: WorkingDir: description: "The working directory for commands to run in." type: "string" + example: "/public/" Entrypoint: description: | The entry point for the container as a string or an array of strings. @@ -1203,38 +1264,50 @@ definitions: type: "array" items: type: "string" + example: [] NetworkDisabled: description: "Disable networking for the container." type: "boolean" + x-nullable: true MacAddress: description: "MAC address of the container." type: "string" + x-nullable: true OnBuild: description: | `ONBUILD` metadata that were defined in the image's `Dockerfile`. type: "array" + x-nullable: true items: type: "string" + example: [] Labels: description: "User-defined key/value metadata." type: "object" additionalProperties: type: "string" + example: + com.example.some-label: "some-value" + com.example.some-other-label: "some-other-value" StopSignal: description: | Signal to stop a container as a string or unsigned integer. type: "string" - default: "SIGTERM" + example: "SIGTERM" + x-nullable: true StopTimeout: description: "Timeout to stop a container in seconds." type: "integer" default: 10 + x-nullable: true Shell: description: | Shell for when `RUN`, `CMD`, and `ENTRYPOINT` uses a shell. type: "array" + x-nullable: true items: type: "string" + example: ["/bin/sh", "-c"] NetworkingConfig: description: | @@ -1491,107 +1564,215 @@ definitions: example: "4443" GraphDriverData: - description: "Information about a container's graph driver." + description: | + Information about the storage driver used to store the container's and + image's filesystem. type: "object" required: [Name, Data] properties: Name: + description: "Name of the storage driver." type: "string" x-nullable: false + example: "overlay2" Data: + description: | + Low-level storage metadata, provided as key/value pairs. + + This information is driver-specific, and depends on the storage-driver + in use, and should be used for informational purposes only. type: "object" x-nullable: false additionalProperties: type: "string" + example: { + "MergedDir": "/var/lib/docker/overlay2/ef749362d13333e65fc95c572eb525abbe0052e16e086cb64bc3b98ae9aa6d74/merged", + "UpperDir": "/var/lib/docker/overlay2/ef749362d13333e65fc95c572eb525abbe0052e16e086cb64bc3b98ae9aa6d74/diff", + "WorkDir": "/var/lib/docker/overlay2/ef749362d13333e65fc95c572eb525abbe0052e16e086cb64bc3b98ae9aa6d74/work" + } - Image: + ImageInspect: + description: | + Information about an image in the local image cache. type: "object" - required: - - Id - - Parent - - Comment - - Created - - Container - - DockerVersion - - Author - - Architecture - - Os - - Size - - VirtualSize - - GraphDriver - - RootFS properties: Id: + description: | + ID is the content-addressable ID of an image. + + This identified is a content-addressable digest calculated from the + image's configuration (which includes the digests of layers used by + the image). + + Note that this digest differs from the `RepoDigests` below, which + holds digests of image manifests that reference the image. type: "string" x-nullable: false + example: "sha256:ec3f0931a6e6b6855d76b2d7b0be30e81860baccd891b2e243280bf1cd8ad710" RepoTags: + description: | + List of image names/tags in the local image cache that reference this + image. + + Multiple image tags can refer to the same imagem and this list may be + empty if no tags reference the image, in which case the image is + "untagged", in which case it can still be referenced by its ID. type: "array" items: type: "string" + example: + - "example:1.0" + - "example:latest" + - "example:stable" + - "internal.registry.example.com:5000/example:1.0" RepoDigests: + description: | + List of content-addressable digests of locally available image manifests + that the image is referenced from. Multiple manifests can refer to the + same image. + + These digests are usually only available if the image was either pulled + from a registry, or if the image was pushed to a registry, which is when + the manifest is generated and its digest calculated. type: "array" items: type: "string" + example: + - "example@sha256:afcc7f1ac1b49db317a7196c902e61c6c3c4607d63599ee1a82d702d249a0ccb" + - "internal.registry.example.com:5000/example@sha256:b69959407d21e8a062e0416bf13405bb2b71ed7a84dde4158ebafacfa06f5578" Parent: + description: | + ID of the parent image. + + Depending on how the image was created, this field may be empty and + is only set for images that were built/created locally. This field + is empty if the image was pulled from an image registry. type: "string" x-nullable: false + example: "" Comment: + description: | + Optional message that was set when committing or importing the image. type: "string" x-nullable: false + example: "" Created: + description: | + Date and time at which the image was created, formatted in + [RFC 3339](https://www.ietf.org/rfc/rfc3339.txt) format with nano-seconds. type: "string" x-nullable: false + example: "2022-02-04T21:20:12.497794809Z" Container: + description: | + The ID of the container that was used to create the image. + + Depending on how the image was created, this field may be empty. type: "string" x-nullable: false + example: "65974bc86f1770ae4bff79f651ebdbce166ae9aada632ee3fa9af3a264911735" ContainerConfig: $ref: "#/definitions/ContainerConfig" DockerVersion: + description: | + The version of Docker that was used to build the image. + + Depending on how the image was created, this field may be empty. type: "string" x-nullable: false + example: "20.10.7" Author: + description: | + Name of the author that was specified when committing the image, or as + specified through MAINTAINER (deprecated) in the Dockerfile. type: "string" x-nullable: false + example: "" Config: $ref: "#/definitions/ContainerConfig" Architecture: + description: | + Hardware CPU architecture that the image runs on. type: "string" x-nullable: false + example: "arm" + Variant: + description: | + CPU architecture variant (presently ARM-only). + type: "string" + x-nullable: true + example: "v7" Os: + description: | + Operating System the image is built to run on. type: "string" x-nullable: false + example: "linux" OsVersion: + description: | + Operating System version the image is built to run on (especially + for Windows). type: "string" + example: "" + x-nullable: true Size: + description: | + Total size of the image including all layers it is composed of. type: "integer" format: "int64" x-nullable: false + example: 1239828 VirtualSize: + description: | + Total size of the image including all layers it is composed of. + + In versions of Docker before v1.10, this field was calculated from + the image itself and all of its parent images. Docker v1.10 and up + store images self-contained, and no longer use a parent-chain, making + this field an equivalent of the Size field. + + This field is kept for backward compatibility, but may be removed in + a future version of the API. type: "integer" format: "int64" x-nullable: false + example: 1239828 GraphDriver: $ref: "#/definitions/GraphDriverData" RootFS: + description: | + Information about the image's RootFS, including the layer IDs. type: "object" required: [Type] properties: Type: type: "string" x-nullable: false + example: "layers" Layers: type: "array" items: type: "string" - BaseLayer: - type: "string" + example: + - "sha256:1834950e52ce4d5a88a1bbd131c537f4d0e56d10ff0dd69e66be3b7dfa9df7e6" + - "sha256:5f70bf18a086007016e948b04aed3b82103a36bea41755b6cddfaf10ace3c6ef" Metadata: + description: | + Additional metadata of the image in the local cache. This information + is local to the daemon, and not part of the image itself. type: "object" properties: LastTagTime: + description: | + Date and time at which the image was last tagged in + [RFC 3339](https://www.ietf.org/rfc/rfc3339.txt) format with nano-seconds. + + This information is only available if the image was tagged locally, + and omitted otherwise. type: "string" format: "dateTime" - + example: "2022-02-28T14:40:02.623929178Z" + x-nullable: true ImageSummary: type: "object" required: @@ -1683,18 +1864,22 @@ definitions: type: "string" description: "Name of the volume." x-nullable: false + example: "tardis" Driver: type: "string" description: "Name of the volume driver used by the volume." x-nullable: false + example: "custom" Mountpoint: type: "string" description: "Mount path of the volume on the host." x-nullable: false + example: "/var/lib/docker/volumes/tardis" CreatedAt: type: "string" format: "dateTime" description: "Date/Time the volume was created." + example: "2016-06-07T20:31:11.853781916Z" Status: type: "object" description: | @@ -1706,12 +1891,17 @@ definitions: does not support this feature. additionalProperties: type: "object" + example: + hello: "world" Labels: type: "object" description: "User-defined key/value metadata." x-nullable: false additionalProperties: type: "string" + example: + com.example.some-label: "some-value" + com.example.some-other-label: "some-other-value" Scope: type: "string" description: | @@ -1720,12 +1910,17 @@ definitions: default: "local" x-nullable: false enum: ["local", "global"] + example: "local" Options: type: "object" description: | The driver specific options used when creating the volume. additionalProperties: type: "string" + example: + device: "tmpfs" + o: "size=100m,uid=1000" + type: "tmpfs" UsageData: type: "object" x-nullable: true @@ -1751,17 +1946,43 @@ definitions: is set to `-1` if the reference-count is not available. x-nullable: false - example: - Name: "tardis" - Driver: "custom" - Mountpoint: "/var/lib/docker/volumes/tardis" - Status: - hello: "world" + VolumeCreateOptions: + description: "Volume configuration" + type: "object" + title: "VolumeConfig" + x-go-name: "VolumeCreateBody" + properties: + Name: + description: | + The new volume's name. If not specified, Docker generates a name. + type: "string" + x-nullable: false + example: "tardis" + Driver: + description: "Name of the volume driver to use." + type: "string" + default: "local" + x-nullable: false + example: "custom" + DriverOpts: + description: | + A mapping of driver options and values. These options are + passed directly to the driver and are driver specific. + type: "object" + additionalProperties: + type: "string" + example: + device: "tmpfs" + o: "size=100m,uid=1000" + type: "tmpfs" Labels: - com.example.some-label: "some-value" - com.example.some-other-label: "some-other-value" - Scope: "local" - CreatedAt: "2016-06-07T20:31:11.853781916Z" + description: "User-defined key/value metadata." + type: "object" + additionalProperties: + type: "string" + example: + com.example.some-label: "some-value" + com.example.some-other-label: "some-other-value" Network: type: "object" @@ -1849,15 +2070,27 @@ definitions: ``` type: "array" items: - type: "object" - additionalProperties: - type: "string" + $ref: "#/definitions/IPAMConfig" Options: description: "Driver-specific options, specified as a map." type: "object" additionalProperties: type: "string" + IPAMConfig: + type: "object" + properties: + Subnet: + type: "string" + IPRange: + type: "string" + Gateway: + type: "string" + AuxiliaryAddresses: + type: "object" + additionalProperties: + type: "string" + NetworkContainer: type: "object" properties: @@ -3641,6 +3874,7 @@ definitions: ServiceSpec: description: "User modifiable configuration for a service." + type: object properties: Name: description: "Name of the service." @@ -4096,7 +4330,7 @@ definitions: Mounts: type: "array" items: - $ref: "#/definitions/Mount" + $ref: "#/definitions/MountPoint" Driver: description: "Driver represents a driver (network, logging, secrets)." @@ -4278,6 +4512,29 @@ definitions: Health: $ref: "#/definitions/Health" + ContainerWaitResponse: + description: "OK response to ContainerWait operation" + type: "object" + x-go-name: "ContainerWaitOKBody" + title: "ContainerWaitResponse" + required: [StatusCode, Error] + properties: + StatusCode: + description: "Exit code of the container" + type: "integer" + x-nullable: false + Error: + $ref: "#/definitions/ContainerWaitExitError" + + ContainerWaitExitError: + description: "container waiting error, if any" + type: "object" + x-go-name: "ContainerWaitOKBodyError" + properties: + Message: + description: "Details of an error" + type: "string" + SystemVersion: type: "object" description: | @@ -4458,14 +4715,13 @@ definitions: description: "Indicates if the host has memory swap limit support enabled." type: "boolean" example: true - KernelMemory: + KernelMemoryTCP: description: | - Indicates if the host has kernel memory limit support enabled. - -


+ Indicates if the host has kernel memory TCP limit support enabled. This + field is omitted if not supported. - > **Deprecated**: This field is deprecated as the kernel 5.4 deprecated - > `kmem.limit_in_bytes`. + Kernel memory TCP limits are not supported when using cgroups v2, which + does not support the corresponding `memory.kmem.tcp.limit_in_bytes` cgroup. type: "boolean" example: true CpuCfsPeriod: @@ -5175,6 +5431,7 @@ definitions: PeerNode: description: "Represents a peer-node in the swarm" + type: "object" properties: NodeID: description: "Unique identifier of for this node in the swarm." @@ -5284,22 +5541,22 @@ definitions: type: "integer" format: "int64" example: 3987495 - # TODO Not yet including these fields for now, as they are nil / omitted in our response. - # urls: - # description: | - # List of URLs from which this object MAY be downloaded. - # type: "array" - # items: - # type: "string" - # format: "uri" - # annotations: - # description: | - # Arbitrary metadata relating to the targeted content. - # type: "object" - # additionalProperties: - # type: "string" - # platform: - # $ref: "#/definitions/OCIPlatform" + # TODO Not yet including these fields for now, as they are nil / omitted in our response. + # urls: + # description: | + # List of URLs from which this object MAY be downloaded. + # type: "array" + # items: + # type: "string" + # format: "uri" + # annotations: + # description: | + # Arbitrary metadata relating to the targeted content. + # type: "object" + # additionalProperties: + # type: "string" + # platform: + # $ref: "#/definitions/OCIPlatform" OCIPlatform: type: "object" @@ -5626,7 +5883,6 @@ paths: Memory: 0 MemorySwap: 0 MemoryReservation: 0 - KernelMemory: 0 NanoCpus: 500000 CpuPercent: 80 CpuShares: 512 @@ -5918,7 +6174,6 @@ paths: Memory: 0 MemorySwap: 0 MemoryReservation: 0 - KernelMemory: 0 OomKillDisable: false OomScoreAdj: 500 NetworkMode: "bridge" @@ -6663,7 +6918,6 @@ paths: Memory: 314572800 MemorySwap: 514288000 MemoryReservation: 209715200 - KernelMemory: 52428800 RestartPolicy: MaximumRetryCount: 4 Name: "on-failure" @@ -7002,22 +7256,11 @@ paths: 200: description: "The container has exit." schema: - type: "object" - title: "ContainerWaitResponse" - description: "OK response to ContainerWait operation" - required: [StatusCode] - properties: - StatusCode: - description: "Exit code of the container" - type: "integer" - x-nullable: false - Error: - description: "container waiting error, if any" - type: "object" - properties: - Message: - description: "Details of an error" - type: "string" + $ref: "#/definitions/ContainerWaitResponse" + 400: + description: "bad parameter" + schema: + $ref: "#/definitions/ErrorResponse" 404: description: "no such container" schema: @@ -7038,9 +7281,14 @@ paths: - name: "condition" in: "query" description: | - Wait until a container state reaches the given condition, either - 'not-running' (default), 'next-exit', or 'removed'. + Wait until a container state reaches the given condition. + + Defaults to `not-running` if omitted or empty. type: "string" + enum: + - "not-running" + - "next-exit" + - "removed" default: "not-running" tags: ["Container"] /containers/{id}: @@ -7116,17 +7364,7 @@ paths: 400: description: "Bad parameter" schema: - allOf: - - $ref: "#/definitions/ErrorResponse" - - type: "object" - properties: - message: - description: | - The error message. Either "must specify path parameter" - (path cannot be empty) or "not a directory" (path was - asserted to be a directory but exists as a file). - type: "string" - x-nullable: false + $ref: "#/definitions/ErrorResponse" 404: description: "Container or path does not exist" schema: @@ -7161,17 +7399,7 @@ paths: 400: description: "Bad parameter" schema: - allOf: - - $ref: "#/definitions/ErrorResponse" - - type: "object" - properties: - message: - description: | - The error message. Either "must specify path parameter" - (path cannot be empty) or "not a directory" (path was - asserted to be a directory but exists as a file). - type: "string" - x-nullable: false + $ref: "#/definitions/ErrorResponse" 404: description: "Container or path does not exist" schema: @@ -7197,7 +7425,10 @@ paths: tags: ["Container"] put: summary: "Extract an archive of files or folders to a directory in a container" - description: "Upload a tar archive to be extracted to a path in the filesystem of container id." + description: | + Upload a tar archive to be extracted to a path in the filesystem of container id. + `path` parameter is asserted to be a directory. If it exists as a file, 400 error + will be returned with message "not a directory". operationId: "PutContainerArchive" consumes: ["application/x-tar", "application/octet-stream"] responses: @@ -7207,6 +7438,9 @@ paths: description: "Bad parameter" schema: $ref: "#/definitions/ErrorResponse" + examples: + application/json: + message: "not a directory" 403: description: "Permission denied, the volume or container rootfs is marked as read-only." schema: @@ -7708,84 +7942,7 @@ paths: 200: description: "No error" schema: - $ref: "#/definitions/Image" - examples: - application/json: - Id: "sha256:85f05633ddc1c50679be2b16a0479ab6f7637f8884e0cfe0f4d20e1ebb3d6e7c" - Container: "cb91e48a60d01f1e27028b4fc6819f4f290b3cf12496c8176ec714d0d390984a" - Comment: "" - Os: "linux" - Architecture: "amd64" - Parent: "sha256:91e54dfb11794fad694460162bf0cb0a4fa710cfa3f60979c177d920813e267c" - ContainerConfig: - Tty: false - Hostname: "e611e15f9c9d" - Domainname: "" - AttachStdout: false - PublishService: "" - AttachStdin: false - OpenStdin: false - StdinOnce: false - NetworkDisabled: false - OnBuild: [] - Image: "91e54dfb11794fad694460162bf0cb0a4fa710cfa3f60979c177d920813e267c" - User: "" - WorkingDir: "" - MacAddress: "" - AttachStderr: false - Labels: - com.example.license: "GPL" - com.example.version: "1.0" - com.example.vendor: "Acme" - Env: - - "PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" - Cmd: - - "/bin/sh" - - "-c" - - "#(nop) LABEL com.example.vendor=Acme com.example.license=GPL com.example.version=1.0" - DockerVersion: "1.9.0-dev" - VirtualSize: 188359297 - Size: 0 - Author: "" - Created: "2015-09-10T08:30:53.26995814Z" - GraphDriver: - Name: "aufs" - Data: {} - RepoDigests: - - "localhost:5000/test/busybox/example@sha256:cbbf2f9a99b47fc460d422812b6a5adff7dfee951d8fa2e4a98caa0382cfbdbf" - RepoTags: - - "example:1.0" - - "example:latest" - - "example:stable" - Config: - Image: "91e54dfb11794fad694460162bf0cb0a4fa710cfa3f60979c177d920813e267c" - NetworkDisabled: false - OnBuild: [] - StdinOnce: false - PublishService: "" - AttachStdin: false - OpenStdin: false - Domainname: "" - AttachStdout: false - Tty: false - Hostname: "e611e15f9c9d" - Cmd: - - "/bin/bash" - Env: - - "PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" - Labels: - com.example.vendor: "Acme" - com.example.version: "1.0" - com.example.license: "GPL" - MacAddress: "" - AttachStderr: false - WorkingDir: "" - User: "" - RootFS: - Type: "layers" - Layers: - - "sha256:1834950e52ce4d5a88a1bbd131c537f4d0e56d10ff0dd69e66be3b7dfa9df7e6" - - "sha256:5f70bf18a086007016e948b04aed3b82103a36bea41755b6cddfaf10ace3c6ef" + $ref: "#/definitions/ImageInspect" 404: description: "No such image" schema: @@ -8220,6 +8377,13 @@ paths: Docker-Experimental: type: "boolean" description: "If the server is running with experimental mode enabled" + Swarm: + type: "string" + enum: ["inactive", "pending", "error", "locked", "active/worker", "active/manager"] + description: | + Contains information about Swarm status of the daemon, + and if the daemon is acting as a manager or worker node. + default: "inactive" Cache-Control: type: "string" default: "no-cache, no-store, must-revalidate" @@ -8259,6 +8423,13 @@ paths: Docker-Experimental: type: "boolean" description: "If the server is running with experimental mode enabled" + Swarm: + type: "string" + enum: ["inactive", "pending", "error", "locked", "active/worker", "active/manager"] + description: | + Contains information about Swarm status of the daemon, + and if the daemon is acting as a manager or worker node. + default: "inactive" Cache-Control: type: "string" default: "no-cache, no-store, must-revalidate" @@ -8925,23 +9096,6 @@ paths: Warnings that occurred when fetching the list of volumes. items: type: "string" - - examples: - application/json: - Volumes: - - CreatedAt: "2017-07-19T12:00:26Z" - Name: "tardis" - Driver: "local" - Mountpoint: "/var/lib/docker/volumes/tardis" - Labels: - com.example.some-label: "some-value" - com.example.some-other-label: "some-other-value" - Scope: "local" - Options: - device: "tmpfs" - o: "size=100m,uid=1000" - type: "tmpfs" - Warnings: [] 500: description: "Server error" schema: @@ -8986,38 +9140,7 @@ paths: required: true description: "Volume configuration" schema: - type: "object" - description: "Volume configuration" - title: "VolumeConfig" - properties: - Name: - description: | - The new volume's name. If not specified, Docker generates a name. - type: "string" - x-nullable: false - Driver: - description: "Name of the volume driver to use." - type: "string" - default: "local" - x-nullable: false - DriverOpts: - description: | - A mapping of driver options and values. These options are - passed directly to the driver and are driver specific. - type: "object" - additionalProperties: - type: "string" - Labels: - description: "User-defined key/value metadata." - type: "object" - additionalProperties: - type: "string" - example: - Name: "tardis" - Labels: - com.example.some-label: "some-value" - com.example.some-other-label: "some-other-value" - Driver: "custom" + $ref: "#/definitions/VolumeCreateOptions" tags: ["Volume"] /volumes/{name}: diff --git a/vendor/github.com/docker/docker/api/types/container/container_wait.go b/vendor/github.com/docker/docker/api/types/container/container_wait.go deleted file mode 100644 index 49e05ae669..0000000000 --- a/vendor/github.com/docker/docker/api/types/container/container_wait.go +++ /dev/null @@ -1,28 +0,0 @@ -package container // import "github.com/docker/docker/api/types/container" - -// ---------------------------------------------------------------------------- -// Code generated by `swagger generate operation`. DO NOT EDIT. -// -// See hack/generate-swagger-api.sh -// ---------------------------------------------------------------------------- - -// ContainerWaitOKBodyError container waiting error, if any -// swagger:model ContainerWaitOKBodyError -type ContainerWaitOKBodyError struct { - - // Details of an error - Message string `json:"Message,omitempty"` -} - -// ContainerWaitOKBody OK response to ContainerWait operation -// swagger:model ContainerWaitOKBody -type ContainerWaitOKBody struct { - - // error - // Required: true - Error *ContainerWaitOKBodyError `json:"Error"` - - // Exit code of the container - // Required: true - StatusCode int64 `json:"StatusCode"` -} diff --git a/vendor/github.com/docker/docker/api/types/container/container_wait_o_k_body.go b/vendor/github.com/docker/docker/api/types/container/container_wait_o_k_body.go new file mode 100644 index 0000000000..3219207fbb --- /dev/null +++ b/vendor/github.com/docker/docker/api/types/container/container_wait_o_k_body.go @@ -0,0 +1,19 @@ +package container + +// This file was generated by the swagger tool. +// Editing this file might prove futile when you re-run the swagger generate command + +// ContainerWaitOKBody ContainerWaitResponse +// +// OK response to ContainerWait operation +// swagger:model ContainerWaitOKBody +type ContainerWaitOKBody struct { + + // error + // Required: true + Error *ContainerWaitOKBodyError `json:"Error"` + + // Exit code of the container + // Required: true + StatusCode int64 `json:"StatusCode"` +} diff --git a/vendor/github.com/docker/docker/api/types/container/container_wait_o_k_body_error.go b/vendor/github.com/docker/docker/api/types/container/container_wait_o_k_body_error.go new file mode 100644 index 0000000000..ee598973ec --- /dev/null +++ b/vendor/github.com/docker/docker/api/types/container/container_wait_o_k_body_error.go @@ -0,0 +1,12 @@ +package container + +// This file was generated by the swagger tool. +// Editing this file might prove futile when you re-run the swagger generate command + +// ContainerWaitOKBodyError container waiting error, if any +// swagger:model ContainerWaitOKBodyError +type ContainerWaitOKBodyError struct { + + // Details of an error + Message string `json:"Message,omitempty"` +} diff --git a/vendor/github.com/docker/docker/api/types/container/host_config.go b/vendor/github.com/docker/docker/api/types/container/host_config.go index dcea6c8a5a..9a5aa28f9a 100644 --- a/vendor/github.com/docker/docker/api/types/container/host_config.go +++ b/vendor/github.com/docker/docker/api/types/container/host_config.go @@ -376,14 +376,17 @@ type Resources struct { Devices []DeviceMapping // List of devices to map inside the container DeviceCgroupRules []string // List of rule to be added to the device cgroup DeviceRequests []DeviceRequest // List of device requests for device drivers - KernelMemory int64 // Kernel memory limit (in bytes), Deprecated: kernel 5.4 deprecated kmem.limit_in_bytes - KernelMemoryTCP int64 // Hard limit for kernel TCP buffer memory (in bytes) - MemoryReservation int64 // Memory soft limit (in bytes) - MemorySwap int64 // Total memory usage (memory + swap); set `-1` to enable unlimited swap - MemorySwappiness *int64 // Tuning container memory swappiness behaviour - OomKillDisable *bool // Whether to disable OOM Killer or not - PidsLimit *int64 // Setting PIDs limit for a container; Set `0` or `-1` for unlimited, or `null` to not change. - Ulimits []*units.Ulimit // List of ulimits to be set in the container + + // KernelMemory specifies the kernel memory limit (in bytes) for the container. + // Deprecated: kernel 5.4 deprecated kmem.limit_in_bytes. + KernelMemory int64 `json:",omitempty"` + KernelMemoryTCP int64 `json:",omitempty"` // Hard limit for kernel TCP buffer memory (in bytes) + MemoryReservation int64 // Memory soft limit (in bytes) + MemorySwap int64 // Total memory usage (memory + swap); set `-1` to enable unlimited swap + MemorySwappiness *int64 // Tuning container memory swappiness behaviour + OomKillDisable *bool // Whether to disable OOM Killer or not + PidsLimit *int64 // Setting PIDs limit for a container; Set `0` or `-1` for unlimited, or `null` to not change. + Ulimits []*units.Ulimit // List of ulimits to be set in the container // Applicable to Windows CPUCount int64 `json:"CpuCount"` // CPU count diff --git a/vendor/github.com/docker/docker/api/types/filters/parse.go b/vendor/github.com/docker/docker/api/types/filters/parse.go index 4bc91cffd6..6a2139adb3 100644 --- a/vendor/github.com/docker/docker/api/types/filters/parse.go +++ b/vendor/github.com/docker/docker/api/types/filters/parse.go @@ -9,6 +9,7 @@ import ( "strings" "github.com/docker/docker/api/types/versions" + "github.com/pkg/errors" ) // Args stores a mapping of keys to a set of multiple values. @@ -97,7 +98,7 @@ func FromJSON(p string) (Args, error) { // Fallback to parsing arguments in the legacy slice format deprecated := map[string][]string{} if legacyErr := json.Unmarshal(raw, &deprecated); legacyErr != nil { - return args, err + return args, invalidFilter{errors.Wrap(err, "invalid filter")} } args.fields = deprecatedArgs(deprecated) @@ -247,10 +248,10 @@ func (args Args) Contains(field string) bool { return ok } -type invalidFilter string +type invalidFilter struct{ error } func (e invalidFilter) Error() string { - return "Invalid filter '" + string(e) + "'" + return e.error.Error() } func (invalidFilter) InvalidParameter() {} @@ -260,7 +261,7 @@ func (invalidFilter) InvalidParameter() {} func (args Args) Validate(accepted map[string]bool) error { for name := range args.fields { if !accepted[name] { - return invalidFilter(name) + return invalidFilter{errors.New("invalid filter '" + name + "'")} } } return nil diff --git a/vendor/github.com/docker/docker/api/types/graph_driver_data.go b/vendor/github.com/docker/docker/api/types/graph_driver_data.go index 4d9bf1c62c..ce3deb331c 100644 --- a/vendor/github.com/docker/docker/api/types/graph_driver_data.go +++ b/vendor/github.com/docker/docker/api/types/graph_driver_data.go @@ -3,15 +3,21 @@ package types // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command -// GraphDriverData Information about a container's graph driver. +// GraphDriverData Information about the storage driver used to store the container's and +// image's filesystem. +// // swagger:model GraphDriverData type GraphDriverData struct { - // data + // Low-level storage metadata, provided as key/value pairs. + // + // This information is driver-specific, and depends on the storage-driver + // in use, and should be used for informational purposes only. + // // Required: true Data map[string]string `json:"Data"` - // name + // Name of the storage driver. // Required: true Name string `json:"Name"` } diff --git a/vendor/github.com/docker/docker/api/types/swarm/swarm.go b/vendor/github.com/docker/docker/api/types/swarm/swarm.go index b25f999646..3eae4b9b29 100644 --- a/vendor/github.com/docker/docker/api/types/swarm/swarm.go +++ b/vendor/github.com/docker/docker/api/types/swarm/swarm.go @@ -213,6 +213,16 @@ type Info struct { Warnings []string `json:",omitempty"` } +// Status provides information about the current swarm status and role, +// obtained from the "Swarm" header in the API response. +type Status struct { + // NodeState represents the state of the node. + NodeState LocalNodeState + + // ControlAvailable indicates if the node is a swarm manager. + ControlAvailable bool +} + // Peer represents a peer. type Peer struct { NodeID string diff --git a/vendor/github.com/docker/docker/api/types/types.go b/vendor/github.com/docker/docker/api/types/types.go index a186550d72..ee52f46212 100644 --- a/vendor/github.com/docker/docker/api/types/types.go +++ b/vendor/github.com/docker/docker/api/types/types.go @@ -19,38 +19,119 @@ import ( // RootFS returns Image's RootFS description including the layer IDs. type RootFS struct { - Type string - Layers []string `json:",omitempty"` - BaseLayer string `json:",omitempty"` + Type string `json:",omitempty"` + Layers []string `json:",omitempty"` } // ImageInspect contains response of Engine API: // GET "/images/{name:.*}/json" type ImageInspect struct { - ID string `json:"Id"` - RepoTags []string - RepoDigests []string - Parent string - Comment string - Created string - Container string + // ID is the content-addressable ID of an image. + // + // This identified is a content-addressable digest calculated from the + // image's configuration (which includes the digests of layers used by + // the image). + // + // Note that this digest differs from the `RepoDigests` below, which + // holds digests of image manifests that reference the image. + ID string `json:"Id"` + + // RepoTags is a list of image names/tags in the local image cache that + // reference this image. + // + // Multiple image tags can refer to the same imagem and this list may be + // empty if no tags reference the image, in which case the image is + // "untagged", in which case it can still be referenced by its ID. + RepoTags []string + + // RepoDigests is a list of content-addressable digests of locally available + // image manifests that the image is referenced from. Multiple manifests can + // refer to the same image. + // + // These digests are usually only available if the image was either pulled + // from a registry, or if the image was pushed to a registry, which is when + // the manifest is generated and its digest calculated. + RepoDigests []string + + // Parent is the ID of the parent image. + // + // Depending on how the image was created, this field may be empty and + // is only set for images that were built/created locally. This field + // is empty if the image was pulled from an image registry. + Parent string + + // Comment is an optional message that can be set when committing or + // importing the image. + Comment string + + // Created is the date and time at which the image was created, formatted in + // RFC 3339 nano-seconds (time.RFC3339Nano). + Created string + + // Container is the ID of the container that was used to create the image. + // + // Depending on how the image was created, this field may be empty. + Container string + + // ContainerConfig is the configuration of the container that was committed + // into the image. ContainerConfig *container.Config - DockerVersion string - Author string - Config *container.Config - Architecture string - Variant string `json:",omitempty"` - Os string - OsVersion string `json:",omitempty"` - Size int64 - VirtualSize int64 - GraphDriver GraphDriverData - RootFS RootFS - Metadata ImageMetadata + + // DockerVersion is the version of Docker that was used to build the image. + // + // Depending on how the image was created, this field may be empty. + DockerVersion string + + // Author is the name of the author that was specified when committing the + // image, or as specified through MAINTAINER (deprecated) in the Dockerfile. + Author string + Config *container.Config + + // Architecture is the hardware CPU architecture that the image runs on. + Architecture string + + // Variant is the CPU architecture variant (presently ARM-only). + Variant string `json:",omitempty"` + + // OS is the Operating System the image is built to run on. + Os string + + // OsVersion is the version of the Operating System the image is built to + // run on (especially for Windows). + OsVersion string `json:",omitempty"` + + // Size is the total size of the image including all layers it is composed of. + Size int64 + + // VirtualSize is the total size of the image including all layers it is + // composed of. + // + // In versions of Docker before v1.10, this field was calculated from + // the image itself and all of its parent images. Docker v1.10 and up + // store images self-contained, and no longer use a parent-chain, making + // this field an equivalent of the Size field. + // + // This field is kept for backward compatibility, but may be removed in + // a future version of the API. + VirtualSize int64 // TODO(thaJeztah): deprecate this field + + // GraphDriver holds information about the storage driver used to store the + // container's and image's filesystem. + GraphDriver GraphDriverData + + // RootFS contains information about the image's RootFS, including the + // layer IDs. + RootFS RootFS + + // Metadata of the image in the local cache. + // + // This information is local to the daemon, and not part of the image itself. + Metadata ImageMetadata } // ImageMetadata contains engine-local data about the image type ImageMetadata struct { + // LastTagTime is the date and time at which the image was last tagged. LastTagTime time.Time `json:",omitempty"` } @@ -107,6 +188,15 @@ type Ping struct { OSType string Experimental bool BuilderVersion BuilderVersion + + // SwarmStatus provides information about the current swarm status of the + // engine, obtained from the "Swarm" header in the API response. + // + // It can be a nil struct if the API version does not provide this header + // in the ping response, or if an error occurred, in which case the client + // should use other ways to get the current swarm status, such as the /swarm + // endpoint. + SwarmStatus *swarm.Status } // ComponentVersion describes the version information for a specific component. @@ -158,8 +248,8 @@ type Info struct { Plugins PluginsInfo MemoryLimit bool SwapLimit bool - KernelMemory bool // Deprecated: kernel 5.4 deprecated kmem.limit_in_bytes - KernelMemoryTCP bool + KernelMemory bool `json:",omitempty"` // Deprecated: kernel 5.4 deprecated kmem.limit_in_bytes + KernelMemoryTCP bool `json:",omitempty"` // KernelMemoryTCP is not supported on cgroups v2. CPUCfsPeriod bool `json:"CpuCfsPeriod"` CPUCfsQuota bool `json:"CpuCfsQuota"` CPUShares bool @@ -421,13 +511,44 @@ type DefaultNetworkSettings struct { // MountPoint represents a mount point configuration inside the container. // This is used for reporting the mountpoints in use by a container. type MountPoint struct { - Type mount.Type `json:",omitempty"` - Name string `json:",omitempty"` - Source string + // Type is the type of mount, see `Type` definitions in + // github.com/docker/docker/api/types/mount.Type + Type mount.Type `json:",omitempty"` + + // Name is the name reference to the underlying data defined by `Source` + // e.g., the volume name. + Name string `json:",omitempty"` + + // Source is the source location of the mount. + // + // For volumes, this contains the storage location of the volume (within + // `/var/lib/docker/volumes/`). For bind-mounts, and `npipe`, this contains + // the source (host) part of the bind-mount. For `tmpfs` mount points, this + // field is empty. + Source string + + // Destination is the path relative to the container root (`/`) where the + // Source is mounted inside the container. Destination string - Driver string `json:",omitempty"` - Mode string - RW bool + + // Driver is the volume driver used to create the volume (if it is a volume). + Driver string `json:",omitempty"` + + // Mode is a comma separated list of options supplied by the user when + // creating the bind/volume mount. + // + // The default is platform-specific (`"z"` on Linux, empty on Windows). + Mode string + + // RW indicates whether the mount is mounted writable (read-write). + RW bool + + // Propagation describes how mounts are propagated from the host into the + // mount point, and vice-versa. Refer to the Linux kernel documentation + // for details: + // https://www.kernel.org/doc/Documentation/filesystems/sharedsubtree.txt + // + // This field is not used on Windows. Propagation mount.Propagation } diff --git a/vendor/github.com/docker/docker/api/types/volume/volume_create.go b/vendor/github.com/docker/docker/api/types/volume/volume_create.go deleted file mode 100644 index 8538078dd6..0000000000 --- a/vendor/github.com/docker/docker/api/types/volume/volume_create.go +++ /dev/null @@ -1,31 +0,0 @@ -package volume // import "github.com/docker/docker/api/types/volume" - -// ---------------------------------------------------------------------------- -// Code generated by `swagger generate operation`. DO NOT EDIT. -// -// See hack/generate-swagger-api.sh -// ---------------------------------------------------------------------------- - -// VolumeCreateBody Volume configuration -// swagger:model VolumeCreateBody -type VolumeCreateBody struct { - - // Name of the volume driver to use. - // Required: true - Driver string `json:"Driver"` - - // A mapping of driver options and values. These options are - // passed directly to the driver and are driver specific. - // - // Required: true - DriverOpts map[string]string `json:"DriverOpts"` - - // User-defined key/value metadata. - // Required: true - Labels map[string]string `json:"Labels"` - - // The new volume's name. If not specified, Docker generates a name. - // - // Required: true - Name string `json:"Name"` -} diff --git a/vendor/github.com/docker/docker/api/types/volume/volume_create_body.go b/vendor/github.com/docker/docker/api/types/volume/volume_create_body.go new file mode 100644 index 0000000000..f40fe1377f --- /dev/null +++ b/vendor/github.com/docker/docker/api/types/volume/volume_create_body.go @@ -0,0 +1,26 @@ +package volume + +// This file was generated by the swagger tool. +// Editing this file might prove futile when you re-run the swagger generate command + +// VolumeCreateBody VolumeConfig +// +// Volume configuration +// swagger:model VolumeCreateBody +type VolumeCreateBody struct { + + // Name of the volume driver to use. + Driver string `json:"Driver,omitempty"` + + // A mapping of driver options and values. These options are + // passed directly to the driver and are driver specific. + // + DriverOpts map[string]string `json:"DriverOpts,omitempty"` + + // User-defined key/value metadata. + Labels map[string]string `json:"Labels,omitempty"` + + // The new volume's name. If not specified, Docker generates a name. + // + Name string `json:"Name,omitempty"` +} diff --git a/vendor/github.com/docker/docker/client/checkpoint_list.go b/vendor/github.com/docker/docker/client/checkpoint_list.go index 66d46dd161..39cfb959ff 100644 --- a/vendor/github.com/docker/docker/client/checkpoint_list.go +++ b/vendor/github.com/docker/docker/client/checkpoint_list.go @@ -20,7 +20,7 @@ func (cli *Client) CheckpointList(ctx context.Context, container string, options resp, err := cli.get(ctx, "/containers/"+container+"/checkpoints", query, nil) defer ensureReaderClosed(resp) if err != nil { - return checkpoints, wrapResponseError(err, resp, "container", container) + return checkpoints, err } err = json.NewDecoder(resp.body).Decode(&checkpoints) diff --git a/vendor/github.com/docker/docker/client/client.go b/vendor/github.com/docker/docker/client/client.go index fa511897e0..1412377eab 100644 --- a/vendor/github.com/docker/docker/client/client.go +++ b/vendor/github.com/docker/docker/client/client.go @@ -43,7 +43,6 @@ package client // import "github.com/docker/docker/client" import ( "context" - "fmt" "net" "net/http" "net/url" @@ -93,15 +92,18 @@ type Client struct { } // CheckRedirect specifies the policy for dealing with redirect responses: -// If the request is non-GET return `ErrRedirect`. Otherwise use the last response. +// If the request is non-GET return ErrRedirect, otherwise use the last response. // -// Go 1.8 changes behavior for HTTP redirects (specifically 301, 307, and 308) in the client . -// The Docker client (and by extension docker API client) can be made to send a request -// like POST /containers//start where what would normally be in the name section of the URL is empty. -// This triggers an HTTP 301 from the daemon. -// In go 1.8 this 301 will be converted to a GET request, and ends up getting a 404 from the daemon. -// This behavior change manifests in the client in that before the 301 was not followed and -// the client did not generate an error, but now results in a message like Error response from daemon: page not found. +// Go 1.8 changes behavior for HTTP redirects (specifically 301, 307, and 308) +// in the client. The Docker client (and by extension docker API client) can be +// made to send a request like POST /containers//start where what would normally +// be in the name section of the URL is empty. This triggers an HTTP 301 from +// the daemon. +// +// In go 1.8 this 301 will be converted to a GET request, and ends up getting +// a 404 from the daemon. This behavior change manifests in the client in that +// before, the 301 was not followed and the client did not generate an error, +// but now results in a message like Error response from daemon: page not found. func CheckRedirect(req *http.Request, via []*http.Request) error { if via[0].Method == http.MethodGet { return http.ErrUseLastResponse @@ -109,13 +111,22 @@ func CheckRedirect(req *http.Request, via []*http.Request) error { return ErrRedirect } -// NewClientWithOpts initializes a new API client with default values. It takes functors -// to modify values when creating it, like `NewClientWithOpts(WithVersion(…))` -// It also initializes the custom http headers to add to each request. +// NewClientWithOpts initializes a new API client with a default HTTPClient, and +// default API host and version. It also initializes the custom HTTP headers to +// add to each request. +// +// It takes an optional list of Opt functional arguments, which are applied in +// the order they're provided, which allows modifying the defaults when creating +// the client. For example, the following initializes a client that configures +// itself with values from environment variables (client.FromEnv), and has +// automatic API version negotiation enabled (client.WithAPIVersionNegotiation()). +// +// +// cli, err := client.NewClientWithOpts( +// client.FromEnv, +// client.WithAPIVersionNegotiation(), +// ) // -// It won't send any version information if the version number is empty. It is -// highly recommended that you set a version or your client may break if the -// server is upgraded. func NewClientWithOpts(ops ...Opt) (*Client, error) { client, err := defaultHTTPClient(DefaultDockerHost) if err != nil { @@ -135,9 +146,6 @@ func NewClientWithOpts(ops ...Opt) (*Client, error) { } } - if _, ok := c.client.Transport.(http.RoundTripper); !ok { - return nil, fmt.Errorf("unable to verify TLS configuration, invalid transport %v", c.client.Transport) - } if c.scheme == "" { c.scheme = "http" @@ -156,12 +164,12 @@ func NewClientWithOpts(ops ...Opt) (*Client, error) { } func defaultHTTPClient(host string) (*http.Client, error) { - url, err := ParseHostURL(host) + hostURL, err := ParseHostURL(host) if err != nil { return nil, err } - transport := new(http.Transport) - sockets.ConfigureTransport(transport, url.Scheme, url.Host) + transport := &http.Transport{} + _ = sockets.ConfigureTransport(transport, hostURL.Scheme, hostURL.Host) return &http.Client{ Transport: transport, CheckRedirect: CheckRedirect, @@ -197,11 +205,21 @@ func (cli *Client) ClientVersion() string { return cli.version } -// NegotiateAPIVersion queries the API and updates the version to match the -// API version. Any errors are silently ignored. If a manual override is in place, -// either through the `DOCKER_API_VERSION` environment variable, or if the client -// was initialized with a fixed version (`opts.WithVersion(xx)`), no negotiation -// will be performed. +// NegotiateAPIVersion queries the API and updates the version to match the API +// version. NegotiateAPIVersion downgrades the client's API version to match the +// APIVersion if the ping version is lower than the default version. If the API +// version reported by the server is higher than the maximum version supported +// by the client, it uses the client's maximum version. +// +// If a manual override is in place, either through the "DOCKER_API_VERSION" +// (EnvOverrideAPIVersion) environment variable, or if the client is initialized +// with a fixed version (WithVersion(xx)), no negotiation is performed. +// +// If the API server's ping response does not contain an API version, or if the +// client did not get a successful ping response, it assumes it is connected with +// an old daemon that does not support API version negotiation, in which case it +// downgrades to the latest version of the API before version negotiation was +// added (1.24). func (cli *Client) NegotiateAPIVersion(ctx context.Context) { if !cli.manualOverride { ping, _ := cli.Ping(ctx) @@ -209,23 +227,31 @@ func (cli *Client) NegotiateAPIVersion(ctx context.Context) { } } -// NegotiateAPIVersionPing updates the client version to match the Ping.APIVersion -// if the ping version is less than the default version. If a manual override is -// in place, either through the `DOCKER_API_VERSION` environment variable, or if -// the client was initialized with a fixed version (`opts.WithVersion(xx)`), no -// negotiation is performed. -func (cli *Client) NegotiateAPIVersionPing(p types.Ping) { +// NegotiateAPIVersionPing downgrades the client's API version to match the +// APIVersion in the ping response. If the API version in pingResponse is higher +// than the maximum version supported by the client, it uses the client's maximum +// version. +// +// If a manual override is in place, either through the "DOCKER_API_VERSION" +// (EnvOverrideAPIVersion) environment variable, or if the client is initialized +// with a fixed version (WithVersion(xx)), no negotiation is performed. +// +// If the API server's ping response does not contain an API version, we assume +// we are connected with an old daemon without API version negotiation support, +// and downgrade to the latest version of the API before version negotiation was +// added (1.24). +func (cli *Client) NegotiateAPIVersionPing(pingResponse types.Ping) { if !cli.manualOverride { - cli.negotiateAPIVersionPing(p) + cli.negotiateAPIVersionPing(pingResponse) } } // negotiateAPIVersionPing queries the API and updates the version to match the -// API version. Any errors are silently ignored. -func (cli *Client) negotiateAPIVersionPing(p types.Ping) { - // try the latest version before versioning headers existed - if p.APIVersion == "" { - p.APIVersion = "1.24" +// API version from the ping response. +func (cli *Client) negotiateAPIVersionPing(pingResponse types.Ping) { + // default to the latest version before versioning headers existed + if pingResponse.APIVersion == "" { + pingResponse.APIVersion = "1.24" } // if the client is not initialized with a version, start with the latest supported version @@ -234,8 +260,8 @@ func (cli *Client) negotiateAPIVersionPing(p types.Ping) { } // if server version is lower than the client version, downgrade - if versions.LessThan(p.APIVersion, cli.version) { - cli.version = p.APIVersion + if versions.LessThan(pingResponse.APIVersion, cli.version) { + cli.version = pingResponse.APIVersion } // Store the results, so that automatic API version negotiation (if enabled) @@ -261,7 +287,7 @@ func (cli *Client) HTTPClient() *http.Client { func ParseHostURL(host string) (*url.URL, error) { protoAddrParts := strings.SplitN(host, "://", 2) if len(protoAddrParts) == 1 { - return nil, fmt.Errorf("unable to parse docker host `%s`", host) + return nil, errors.Errorf("unable to parse docker host `%s`", host) } var basePath string @@ -281,7 +307,9 @@ func ParseHostURL(host string) (*url.URL, error) { }, nil } -// Dialer returns a dialer for a raw stream connection, with HTTP/1.1 header, that can be used for proxying the daemon connection. +// Dialer returns a dialer for a raw stream connection, with an HTTP/1.1 header, +// that can be used for proxying the daemon connection. +// // Used by `docker dial-stdio` (docker/cli#889). func (cli *Client) Dialer() func(context.Context) (net.Conn, error) { return func(ctx context.Context) (net.Conn, error) { diff --git a/vendor/github.com/docker/docker/client/client_unix.go b/vendor/github.com/docker/docker/client/client_unix.go index 5846f888fe..f0783f7085 100644 --- a/vendor/github.com/docker/docker/client/client_unix.go +++ b/vendor/github.com/docker/docker/client/client_unix.go @@ -3,7 +3,8 @@ package client // import "github.com/docker/docker/client" -// DefaultDockerHost defines os specific default if DOCKER_HOST is unset +// DefaultDockerHost defines OS-specific default host if the DOCKER_HOST +// (EnvOverrideHost) environment variable is unset or empty. const DefaultDockerHost = "unix:///var/run/docker.sock" const defaultProto = "unix" diff --git a/vendor/github.com/docker/docker/client/client_windows.go b/vendor/github.com/docker/docker/client/client_windows.go index c649e54412..5abe60457d 100644 --- a/vendor/github.com/docker/docker/client/client_windows.go +++ b/vendor/github.com/docker/docker/client/client_windows.go @@ -1,6 +1,7 @@ package client // import "github.com/docker/docker/client" -// DefaultDockerHost defines os specific default if DOCKER_HOST is unset +// DefaultDockerHost defines OS-specific default host if the DOCKER_HOST +// (EnvOverrideHost) environment variable is unset or empty. const DefaultDockerHost = "npipe:////./pipe/docker_engine" const defaultProto = "npipe" diff --git a/vendor/github.com/docker/docker/client/config_inspect.go b/vendor/github.com/docker/docker/client/config_inspect.go index f1b0d7f753..9be7882c3d 100644 --- a/vendor/github.com/docker/docker/client/config_inspect.go +++ b/vendor/github.com/docker/docker/client/config_inspect.go @@ -20,7 +20,7 @@ func (cli *Client) ConfigInspectWithRaw(ctx context.Context, id string) (swarm.C resp, err := cli.get(ctx, "/configs/"+id, nil, nil) defer ensureReaderClosed(resp) if err != nil { - return swarm.Config{}, nil, wrapResponseError(err, resp, "config", id) + return swarm.Config{}, nil, err } body, err := io.ReadAll(resp.body) diff --git a/vendor/github.com/docker/docker/client/config_remove.go b/vendor/github.com/docker/docker/client/config_remove.go index 93de0d8445..24b94e9c18 100644 --- a/vendor/github.com/docker/docker/client/config_remove.go +++ b/vendor/github.com/docker/docker/client/config_remove.go @@ -9,5 +9,5 @@ func (cli *Client) ConfigRemove(ctx context.Context, id string) error { } resp, err := cli.delete(ctx, "/configs/"+id, nil, nil) defer ensureReaderClosed(resp) - return wrapResponseError(err, resp, "config", id) + return err } diff --git a/vendor/github.com/docker/docker/client/container_copy.go b/vendor/github.com/docker/docker/client/container_copy.go index c0a47c14e3..d8b7bb6b91 100644 --- a/vendor/github.com/docker/docker/client/container_copy.go +++ b/vendor/github.com/docker/docker/client/container_copy.go @@ -23,7 +23,7 @@ func (cli *Client) ContainerStatPath(ctx context.Context, containerID, path stri response, err := cli.head(ctx, urlStr, query, nil) defer ensureReaderClosed(response) if err != nil { - return types.ContainerPathStat{}, wrapResponseError(err, response, "container:path", containerID+":"+path) + return types.ContainerPathStat{}, err } return getContainerPathStatFromHeader(response.header) } @@ -47,7 +47,7 @@ func (cli *Client) CopyToContainer(ctx context.Context, containerID, dstPath str response, err := cli.putRaw(ctx, apiPath, query, content, nil) defer ensureReaderClosed(response) if err != nil { - return wrapResponseError(err, response, "container:path", containerID+":"+dstPath) + return err } // TODO this code converts non-error status-codes (e.g., "204 No Content") into an error; verify if this is the desired behavior @@ -67,7 +67,7 @@ func (cli *Client) CopyFromContainer(ctx context.Context, containerID, srcPath s apiPath := "/containers/" + containerID + "/archive" response, err := cli.get(ctx, apiPath, query, nil) if err != nil { - return nil, types.ContainerPathStat{}, wrapResponseError(err, response, "container:path", containerID+":"+srcPath) + return nil, types.ContainerPathStat{}, err } // TODO this code converts non-error status-codes (e.g., "204 No Content") into an error; verify if this is the desired behavior diff --git a/vendor/github.com/docker/docker/client/container_inspect.go b/vendor/github.com/docker/docker/client/container_inspect.go index 43db32bd97..d48f0d3a68 100644 --- a/vendor/github.com/docker/docker/client/container_inspect.go +++ b/vendor/github.com/docker/docker/client/container_inspect.go @@ -18,7 +18,7 @@ func (cli *Client) ContainerInspect(ctx context.Context, containerID string) (ty serverResp, err := cli.get(ctx, "/containers/"+containerID+"/json", nil, nil) defer ensureReaderClosed(serverResp) if err != nil { - return types.ContainerJSON{}, wrapResponseError(err, serverResp, "container", containerID) + return types.ContainerJSON{}, err } var response types.ContainerJSON @@ -38,7 +38,7 @@ func (cli *Client) ContainerInspectWithRaw(ctx context.Context, containerID stri serverResp, err := cli.get(ctx, "/containers/"+containerID+"/json", query, nil) defer ensureReaderClosed(serverResp) if err != nil { - return types.ContainerJSON{}, nil, wrapResponseError(err, serverResp, "container", containerID) + return types.ContainerJSON{}, nil, err } body, err := io.ReadAll(serverResp.body) diff --git a/vendor/github.com/docker/docker/client/container_list.go b/vendor/github.com/docker/docker/client/container_list.go index a973de597f..bd491b3db9 100644 --- a/vendor/github.com/docker/docker/client/container_list.go +++ b/vendor/github.com/docker/docker/client/container_list.go @@ -18,7 +18,7 @@ func (cli *Client) ContainerList(ctx context.Context, options types.ContainerLis query.Set("all", "1") } - if options.Limit != -1 { + if options.Limit > 0 { query.Set("limit", strconv.Itoa(options.Limit)) } diff --git a/vendor/github.com/docker/docker/client/container_logs.go b/vendor/github.com/docker/docker/client/container_logs.go index 5b6541f035..e9ae2f680f 100644 --- a/vendor/github.com/docker/docker/client/container_logs.go +++ b/vendor/github.com/docker/docker/client/container_logs.go @@ -74,7 +74,7 @@ func (cli *Client) ContainerLogs(ctx context.Context, container string, options resp, err := cli.get(ctx, "/containers/"+container+"/logs", query, nil) if err != nil { - return nil, wrapResponseError(err, resp, "container", container) + return nil, err } return resp.body, nil } diff --git a/vendor/github.com/docker/docker/client/container_remove.go b/vendor/github.com/docker/docker/client/container_remove.go index df81461b88..c21de609b0 100644 --- a/vendor/github.com/docker/docker/client/container_remove.go +++ b/vendor/github.com/docker/docker/client/container_remove.go @@ -23,5 +23,5 @@ func (cli *Client) ContainerRemove(ctx context.Context, containerID string, opti resp, err := cli.delete(ctx, "/containers/"+containerID, query, nil) defer ensureReaderClosed(resp) - return wrapResponseError(err, resp, "container", containerID) + return err } diff --git a/vendor/github.com/docker/docker/client/container_wait.go b/vendor/github.com/docker/docker/client/container_wait.go index 6ab8c1da96..e9b134c9d2 100644 --- a/vendor/github.com/docker/docker/client/container_wait.go +++ b/vendor/github.com/docker/docker/client/container_wait.go @@ -33,7 +33,9 @@ func (cli *Client) ContainerWait(ctx context.Context, containerID string, condit errC := make(chan error, 1) query := url.Values{} - query.Set("condition", string(condition)) + if condition != "" { + query.Set("condition", string(condition)) + } resp, err := cli.post(ctx, "/containers/"+containerID+"/wait", query, nil, nil) if err != nil { diff --git a/vendor/github.com/docker/docker/client/envvars.go b/vendor/github.com/docker/docker/client/envvars.go new file mode 100644 index 0000000000..61dd45c1d7 --- /dev/null +++ b/vendor/github.com/docker/docker/client/envvars.go @@ -0,0 +1,90 @@ +package client // import "github.com/docker/docker/client" + +const ( + // EnvOverrideHost is the name of the environment variable that can be used + // to override the default host to connect to (DefaultDockerHost). + // + // This env-var is read by FromEnv and WithHostFromEnv and when set to a + // non-empty value, takes precedence over the default host (which is platform + // specific), or any host already set. + EnvOverrideHost = "DOCKER_HOST" + + // EnvOverrideAPIVersion is the name of the environment variable that can + // be used to override the API version to use. Value should be + // formatted as MAJOR.MINOR, for example, "1.19". + // + // This env-var is read by FromEnv and WithVersionFromEnv and when set to a + // non-empty value, takes precedence over API version negotiation. + // + // This environment variable should be used for debugging purposes only, as + // it can set the client to use an incompatible (or invalid) API version. + EnvOverrideAPIVersion = "DOCKER_API_VERSION" + + // EnvOverrideCertPath is the name of the environment variable that can be + // used to specify the directory from which to load the TLS certificates + // (ca.pem, cert.pem, key.pem) from. These certificates are used to configure + // the Client for a TCP connection protected by TLS client authentication. + // + // TLS certificate verification is enabled by default if the Client is configured + // to use a TLS connection. Refer to EnvTLSVerify below to learn how to + // disable verification for testing purposes. + // + // WARNING: Access to the remote API is equivalent to root access to the + // host where the daemon runs. Do not expose the API without protection, + // and only if needed. Make sure you are familiar with the "daemon attack + // surface" (https://docs.docker.com/go/attack-surface/). + // + // For local access to the API, it is recommended to connect with the daemon + // using the default local socket connection (on Linux), or the named pipe + // (on Windows). + // + // If you need to access the API of a remote daemon, consider using an SSH + // (ssh://) connection, which is easier to set up, and requires no additional + // configuration if the host is accessible using ssh. + // + // If you cannot use the alternatives above, and you must expose the API over + // a TCP connection, refer to https://docs.docker.com/engine/security/protect-access/ + // to learn how to configure the daemon and client to use a TCP connection + // with TLS client authentication. Make sure you know the differences between + // a regular TLS connection and a TLS connection protected by TLS client + // authentication, and verify that the API cannot be accessed by other clients. + EnvOverrideCertPath = "DOCKER_CERT_PATH" + + // EnvTLSVerify is the name of the environment variable that can be used to + // enable or disable TLS certificate verification. When set to a non-empty + // value, TLS certificate verification is enabled, and the client is configured + // to use a TLS connection, using certificates from the default directories + // (within `~/.docker`); refer to EnvOverrideCertPath above for additional + // details. + // + // WARNING: Access to the remote API is equivalent to root access to the + // host where the daemon runs. Do not expose the API without protection, + // and only if needed. Make sure you are familiar with the "daemon attack + // surface" (https://docs.docker.com/go/attack-surface/). + // + // Before setting up your client and daemon to use a TCP connection with TLS + // client authentication, consider using one of the alternatives mentioned + // in EnvOverrideCertPath above. + // + // Disabling TLS certificate verification (for testing purposes) + // + // TLS certificate verification is enabled by default if the Client is configured + // to use a TLS connection, and it is highly recommended to keep verification + // enabled to prevent machine-in-the-middle attacks. Refer to the documentation + // at https://docs.docker.com/engine/security/protect-access/ and pages linked + // from that page to learn how to configure the daemon and client to use a + // TCP connection with TLS client authentication enabled. + // + // Set the "DOCKER_TLS_VERIFY" environment to an empty string ("") to + // disable TLS certificate verification. Disabling verification is insecure, + // so should only be done for testing purposes. From the Go documentation + // (https://pkg.go.dev/crypto/tls#Config): + // + // InsecureSkipVerify controls whether a client verifies the server's + // certificate chain and host name. If InsecureSkipVerify is true, crypto/tls + // accepts any certificate presented by the server and any host name in that + // certificate. In this mode, TLS is susceptible to machine-in-the-middle + // attacks unless custom verification is used. This should be used only for + // testing or in combination with VerifyConnection or VerifyPeerCertificate. + EnvTLSVerify = "DOCKER_TLS_VERIFY" +) diff --git a/vendor/github.com/docker/docker/client/errors.go b/vendor/github.com/docker/docker/client/errors.go index 041bc8d49c..257921cebb 100644 --- a/vendor/github.com/docker/docker/client/errors.go +++ b/vendor/github.com/docker/docker/client/errors.go @@ -2,7 +2,6 @@ package client // import "github.com/docker/docker/client" import ( "fmt" - "net/http" "github.com/docker/docker/api/types/versions" "github.com/docker/docker/errdefs" @@ -59,19 +58,6 @@ func (e objectNotFoundError) Error() string { return fmt.Sprintf("Error: No such %s: %s", e.object, e.id) } -func wrapResponseError(err error, resp serverResponse, object, id string) error { - switch { - case err == nil: - return nil - case resp.statusCode == http.StatusNotFound: - return objectNotFoundError{object: object, id: id} - case resp.statusCode == http.StatusNotImplemented: - return errdefs.NotImplemented(err) - default: - return err - } -} - // unauthorizedError represents an authorization error in a remote registry. type unauthorizedError struct { cause error diff --git a/vendor/github.com/docker/docker/client/image_inspect.go b/vendor/github.com/docker/docker/client/image_inspect.go index 03aa12d8b4..1de10e5a08 100644 --- a/vendor/github.com/docker/docker/client/image_inspect.go +++ b/vendor/github.com/docker/docker/client/image_inspect.go @@ -17,7 +17,7 @@ func (cli *Client) ImageInspectWithRaw(ctx context.Context, imageID string) (typ serverResp, err := cli.get(ctx, "/images/"+imageID+"/json", nil, nil) defer ensureReaderClosed(serverResp) if err != nil { - return types.ImageInspect{}, nil, wrapResponseError(err, serverResp, "image", imageID) + return types.ImageInspect{}, nil, err } body, err := io.ReadAll(serverResp.body) diff --git a/vendor/github.com/docker/docker/client/image_remove.go b/vendor/github.com/docker/docker/client/image_remove.go index 84a41af0f2..6a9fb3f41f 100644 --- a/vendor/github.com/docker/docker/client/image_remove.go +++ b/vendor/github.com/docker/docker/client/image_remove.go @@ -23,7 +23,7 @@ func (cli *Client) ImageRemove(ctx context.Context, imageID string, options type resp, err := cli.delete(ctx, "/images/"+imageID, query, nil) defer ensureReaderClosed(resp) if err != nil { - return dels, wrapResponseError(err, resp, "image", imageID) + return dels, err } err = json.NewDecoder(resp.body).Decode(&dels) diff --git a/vendor/github.com/docker/docker/client/image_search.go b/vendor/github.com/docker/docker/client/image_search.go index 5f40a22a96..e69fa37225 100644 --- a/vendor/github.com/docker/docker/client/image_search.go +++ b/vendor/github.com/docker/docker/client/image_search.go @@ -3,8 +3,8 @@ package client // import "github.com/docker/docker/client" import ( "context" "encoding/json" - "fmt" "net/url" + "strconv" "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/filters" @@ -18,7 +18,9 @@ func (cli *Client) ImageSearch(ctx context.Context, term string, options types.I var results []registry.SearchResult query := url.Values{} query.Set("term", term) - query.Set("limit", fmt.Sprintf("%d", options.Limit)) + if options.Limit > 0 { + query.Set("limit", strconv.Itoa(options.Limit)) + } if options.Filters.Len() > 0 { filterJSON, err := filters.ToJSON(options.Filters) diff --git a/vendor/github.com/docker/docker/client/network_inspect.go b/vendor/github.com/docker/docker/client/network_inspect.go index ecf20ceb6e..0f90e2bb90 100644 --- a/vendor/github.com/docker/docker/client/network_inspect.go +++ b/vendor/github.com/docker/docker/client/network_inspect.go @@ -36,7 +36,7 @@ func (cli *Client) NetworkInspectWithRaw(ctx context.Context, networkID string, resp, err = cli.get(ctx, "/networks/"+networkID, query, nil) defer ensureReaderClosed(resp) if err != nil { - return networkResource, nil, wrapResponseError(err, resp, "network", networkID) + return networkResource, nil, err } body, err := io.ReadAll(resp.body) diff --git a/vendor/github.com/docker/docker/client/network_remove.go b/vendor/github.com/docker/docker/client/network_remove.go index e71b16d869..9d6c6cef07 100644 --- a/vendor/github.com/docker/docker/client/network_remove.go +++ b/vendor/github.com/docker/docker/client/network_remove.go @@ -6,5 +6,5 @@ import "context" func (cli *Client) NetworkRemove(ctx context.Context, networkID string) error { resp, err := cli.delete(ctx, "/networks/"+networkID, nil, nil) defer ensureReaderClosed(resp) - return wrapResponseError(err, resp, "network", networkID) + return err } diff --git a/vendor/github.com/docker/docker/client/node_inspect.go b/vendor/github.com/docker/docker/client/node_inspect.go index b58db52856..95ab9b1be0 100644 --- a/vendor/github.com/docker/docker/client/node_inspect.go +++ b/vendor/github.com/docker/docker/client/node_inspect.go @@ -17,7 +17,7 @@ func (cli *Client) NodeInspectWithRaw(ctx context.Context, nodeID string) (swarm serverResp, err := cli.get(ctx, "/nodes/"+nodeID, nil, nil) defer ensureReaderClosed(serverResp) if err != nil { - return swarm.Node{}, nil, wrapResponseError(err, serverResp, "node", nodeID) + return swarm.Node{}, nil, err } body, err := io.ReadAll(serverResp.body) diff --git a/vendor/github.com/docker/docker/client/node_remove.go b/vendor/github.com/docker/docker/client/node_remove.go index 03ab878097..e44436debc 100644 --- a/vendor/github.com/docker/docker/client/node_remove.go +++ b/vendor/github.com/docker/docker/client/node_remove.go @@ -16,5 +16,5 @@ func (cli *Client) NodeRemove(ctx context.Context, nodeID string, options types. resp, err := cli.delete(ctx, "/nodes/"+nodeID, query, nil) defer ensureReaderClosed(resp) - return wrapResponseError(err, resp, "node", nodeID) + return err } diff --git a/vendor/github.com/docker/docker/client/options.go b/vendor/github.com/docker/docker/client/options.go index 6f77f0955f..98d96f792e 100644 --- a/vendor/github.com/docker/docker/client/options.go +++ b/vendor/github.com/docker/docker/client/options.go @@ -18,38 +18,26 @@ type Opt func(*Client) error // FromEnv configures the client with values from environment variables. // -// Supported environment variables: -// DOCKER_HOST to set the url to the docker server. -// DOCKER_API_VERSION to set the version of the API to reach, leave empty for latest. -// DOCKER_CERT_PATH to load the TLS certificates from. -// DOCKER_TLS_VERIFY to enable or disable TLS verification, off by default. +// FromEnv uses the following environment variables: +// +// DOCKER_HOST (EnvOverrideHost) to set the URL to the docker server. +// +// DOCKER_API_VERSION (EnvOverrideAPIVersion) to set the version of the API to +// use, leave empty for latest. +// +// DOCKER_CERT_PATH (EnvOverrideCertPath) to specify the directory from which to +// load the TLS certificates (ca.pem, cert.pem, key.pem). +// +// DOCKER_TLS_VERIFY (EnvTLSVerify) to enable or disable TLS verification (off by +// default). func FromEnv(c *Client) error { - if dockerCertPath := os.Getenv("DOCKER_CERT_PATH"); dockerCertPath != "" { - options := tlsconfig.Options{ - CAFile: filepath.Join(dockerCertPath, "ca.pem"), - CertFile: filepath.Join(dockerCertPath, "cert.pem"), - KeyFile: filepath.Join(dockerCertPath, "key.pem"), - InsecureSkipVerify: os.Getenv("DOCKER_TLS_VERIFY") == "", - } - tlsc, err := tlsconfig.Client(options) - if err != nil { - return err - } - - c.client = &http.Client{ - Transport: &http.Transport{TLSClientConfig: tlsc}, - CheckRedirect: CheckRedirect, - } - } - - if host := os.Getenv("DOCKER_HOST"); host != "" { - if err := WithHost(host)(c); err != nil { - return err - } + ops := []Opt{ + WithTLSClientConfigFromEnv(), + WithHostFromEnv(), + WithVersionFromEnv(), } - - if version := os.Getenv("DOCKER_API_VERSION"); version != "" { - if err := WithVersion(version)(c); err != nil { + for _, op := range ops { + if err := op(c); err != nil { return err } } @@ -93,6 +81,18 @@ func WithHost(host string) Opt { } } +// WithHostFromEnv overrides the client host with the host specified in the +// DOCKER_HOST (EnvOverrideHost) environment variable. If DOCKER_HOST is not set, +// or set to an empty value, the host is not modified. +func WithHostFromEnv() Opt { + return func(c *Client) error { + if host := os.Getenv(EnvOverrideHost); host != "" { + return WithHost(host)(c) + } + return nil + } +} + // WithHTTPClient overrides the client http client with the specified one func WithHTTPClient(client *http.Client) Opt { return func(c *Client) error { @@ -148,6 +148,42 @@ func WithTLSClientConfig(cacertPath, certPath, keyPath string) Opt { } } +// WithTLSClientConfigFromEnv configures the client's TLS settings with the +// settings in the DOCKER_CERT_PATH and DOCKER_TLS_VERIFY environment variables. +// If DOCKER_CERT_PATH is not set or empty, TLS configuration is not modified. +// +// WithTLSClientConfigFromEnv uses the following environment variables: +// +// DOCKER_CERT_PATH (EnvOverrideCertPath) to specify the directory from which to +// load the TLS certificates (ca.pem, cert.pem, key.pem). +// +// DOCKER_TLS_VERIFY (EnvTLSVerify) to enable or disable TLS verification (off by +// default). +func WithTLSClientConfigFromEnv() Opt { + return func(c *Client) error { + dockerCertPath := os.Getenv(EnvOverrideCertPath) + if dockerCertPath == "" { + return nil + } + options := tlsconfig.Options{ + CAFile: filepath.Join(dockerCertPath, "ca.pem"), + CertFile: filepath.Join(dockerCertPath, "cert.pem"), + KeyFile: filepath.Join(dockerCertPath, "key.pem"), + InsecureSkipVerify: os.Getenv(EnvTLSVerify) == "", + } + tlsc, err := tlsconfig.Client(options) + if err != nil { + return err + } + + c.client = &http.Client{ + Transport: &http.Transport{TLSClientConfig: tlsc}, + CheckRedirect: CheckRedirect, + } + return nil + } +} + // WithVersion overrides the client version with the specified one. If an empty // version is specified, the value will be ignored to allow version negotiation. func WithVersion(version string) Opt { @@ -160,6 +196,15 @@ func WithVersion(version string) Opt { } } +// WithVersionFromEnv overrides the client version with the version specified in +// the DOCKER_API_VERSION environment variable. If DOCKER_API_VERSION is not set, +// the version is not modified. +func WithVersionFromEnv() Opt { + return func(c *Client) error { + return WithVersion(os.Getenv(EnvOverrideAPIVersion))(c) + } +} + // WithAPIVersionNegotiation enables automatic API version negotiation for the client. // With this option enabled, the client automatically negotiates the API version // to use when making requests. API version negotiation is performed on the first diff --git a/vendor/github.com/docker/docker/client/ping.go b/vendor/github.com/docker/docker/client/ping.go index a9af001ef4..27e8695cb5 100644 --- a/vendor/github.com/docker/docker/client/ping.go +++ b/vendor/github.com/docker/docker/client/ping.go @@ -4,8 +4,10 @@ import ( "context" "net/http" "path" + "strings" "github.com/docker/docker/api/types" + "github.com/docker/docker/api/types/swarm" "github.com/docker/docker/errdefs" ) @@ -61,6 +63,13 @@ func parsePingResponse(cli *Client, resp serverResponse) (types.Ping, error) { if bv := resp.header.Get("Builder-Version"); bv != "" { ping.BuilderVersion = types.BuilderVersion(bv) } + if si := resp.header.Get("Swarm"); si != "" { + parts := strings.SplitN(si, "/", 2) + ping.SwarmStatus = &swarm.Status{ + NodeState: swarm.LocalNodeState(parts[0]), + ControlAvailable: len(parts) == 2 && parts[1] == "manager", + } + } err := cli.checkResponseErr(resp) return ping, errdefs.FromStatusCode(err, resp.statusCode) } diff --git a/vendor/github.com/docker/docker/client/plugin_inspect.go b/vendor/github.com/docker/docker/client/plugin_inspect.go index 4a90bec51a..f09e460660 100644 --- a/vendor/github.com/docker/docker/client/plugin_inspect.go +++ b/vendor/github.com/docker/docker/client/plugin_inspect.go @@ -17,7 +17,7 @@ func (cli *Client) PluginInspectWithRaw(ctx context.Context, name string) (*type resp, err := cli.get(ctx, "/plugins/"+name+"/json", nil, nil) defer ensureReaderClosed(resp) if err != nil { - return nil, nil, wrapResponseError(err, resp, "plugin", name) + return nil, nil, err } body, err := io.ReadAll(resp.body) diff --git a/vendor/github.com/docker/docker/client/plugin_list.go b/vendor/github.com/docker/docker/client/plugin_list.go index cf1935e2f5..2091a054d6 100644 --- a/vendor/github.com/docker/docker/client/plugin_list.go +++ b/vendor/github.com/docker/docker/client/plugin_list.go @@ -25,7 +25,7 @@ func (cli *Client) PluginList(ctx context.Context, filter filters.Args) (types.P resp, err := cli.get(ctx, "/plugins", query, nil) defer ensureReaderClosed(resp) if err != nil { - return plugins, wrapResponseError(err, resp, "plugin", "") + return plugins, err } err = json.NewDecoder(resp.body).Decode(&plugins) diff --git a/vendor/github.com/docker/docker/client/plugin_remove.go b/vendor/github.com/docker/docker/client/plugin_remove.go index 51ca1040d6..4cd66958c3 100644 --- a/vendor/github.com/docker/docker/client/plugin_remove.go +++ b/vendor/github.com/docker/docker/client/plugin_remove.go @@ -16,5 +16,5 @@ func (cli *Client) PluginRemove(ctx context.Context, name string, options types. resp, err := cli.delete(ctx, "/plugins/"+name, query, nil) defer ensureReaderClosed(resp) - return wrapResponseError(err, resp, "plugin", name) + return err } diff --git a/vendor/github.com/docker/docker/client/request.go b/vendor/github.com/docker/docker/client/request.go index 475ce4bd40..3e4911e57f 100644 --- a/vendor/github.com/docker/docker/client/request.go +++ b/vendor/github.com/docker/docker/client/request.go @@ -154,10 +154,8 @@ func (cli *Client) doRequest(ctx context.Context, req *http.Request) (serverResp if err.Timeout() { return serverResp, ErrorConnectionFailed(cli.host) } - if !err.Temporary() { - if strings.Contains(err.Error(), "connection refused") || strings.Contains(err.Error(), "dial unix") { - return serverResp, ErrorConnectionFailed(cli.host) - } + if strings.Contains(err.Error(), "connection refused") || strings.Contains(err.Error(), "dial unix") { + return serverResp, ErrorConnectionFailed(cli.host) } } @@ -240,14 +238,14 @@ func (cli *Client) addHeaders(req *http.Request, headers headers) *http.Request // Add CLI Config's HTTP Headers BEFORE we set the Docker headers // then the user can't change OUR headers for k, v := range cli.customHTTPHeaders { - if versions.LessThan(cli.version, "1.25") && k == "User-Agent" { + if versions.LessThan(cli.version, "1.25") && http.CanonicalHeaderKey(k) == "User-Agent" { continue } req.Header.Set(k, v) } for k, v := range headers { - req.Header[k] = v + req.Header[http.CanonicalHeaderKey(k)] = v } return req } diff --git a/vendor/github.com/docker/docker/client/secret_inspect.go b/vendor/github.com/docker/docker/client/secret_inspect.go index c07c9550d4..5906874b15 100644 --- a/vendor/github.com/docker/docker/client/secret_inspect.go +++ b/vendor/github.com/docker/docker/client/secret_inspect.go @@ -20,7 +20,7 @@ func (cli *Client) SecretInspectWithRaw(ctx context.Context, id string) (swarm.S resp, err := cli.get(ctx, "/secrets/"+id, nil, nil) defer ensureReaderClosed(resp) if err != nil { - return swarm.Secret{}, nil, wrapResponseError(err, resp, "secret", id) + return swarm.Secret{}, nil, err } body, err := io.ReadAll(resp.body) diff --git a/vendor/github.com/docker/docker/client/secret_remove.go b/vendor/github.com/docker/docker/client/secret_remove.go index f6c69e57f8..f47f68b6e0 100644 --- a/vendor/github.com/docker/docker/client/secret_remove.go +++ b/vendor/github.com/docker/docker/client/secret_remove.go @@ -9,5 +9,5 @@ func (cli *Client) SecretRemove(ctx context.Context, id string) error { } resp, err := cli.delete(ctx, "/secrets/"+id, nil, nil) defer ensureReaderClosed(resp) - return wrapResponseError(err, resp, "secret", id) + return err } diff --git a/vendor/github.com/docker/docker/client/service_create.go b/vendor/github.com/docker/docker/client/service_create.go index a07315f71f..23024d0f8f 100644 --- a/vendor/github.com/docker/docker/client/service_create.go +++ b/vendor/github.com/docker/docker/client/service_create.go @@ -9,7 +9,7 @@ import ( "github.com/docker/distribution/reference" "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/swarm" - digest "github.com/opencontainers/go-digest" + "github.com/opencontainers/go-digest" "github.com/pkg/errors" ) diff --git a/vendor/github.com/docker/docker/client/service_inspect.go b/vendor/github.com/docker/docker/client/service_inspect.go index c5368bab1e..cee020c98b 100644 --- a/vendor/github.com/docker/docker/client/service_inspect.go +++ b/vendor/github.com/docker/docker/client/service_inspect.go @@ -22,7 +22,7 @@ func (cli *Client) ServiceInspectWithRaw(ctx context.Context, serviceID string, serverResp, err := cli.get(ctx, "/services/"+serviceID, query, nil) defer ensureReaderClosed(serverResp) if err != nil { - return swarm.Service{}, nil, wrapResponseError(err, serverResp, "service", serviceID) + return swarm.Service{}, nil, err } body, err := io.ReadAll(serverResp.body) diff --git a/vendor/github.com/docker/docker/client/service_remove.go b/vendor/github.com/docker/docker/client/service_remove.go index 953a2adf5a..2c46326ebc 100644 --- a/vendor/github.com/docker/docker/client/service_remove.go +++ b/vendor/github.com/docker/docker/client/service_remove.go @@ -6,5 +6,5 @@ import "context" func (cli *Client) ServiceRemove(ctx context.Context, serviceID string) error { resp, err := cli.delete(ctx, "/services/"+serviceID, nil, nil) defer ensureReaderClosed(resp) - return wrapResponseError(err, resp, "service", serviceID) + return err } diff --git a/vendor/github.com/docker/docker/client/task_inspect.go b/vendor/github.com/docker/docker/client/task_inspect.go index 410fc526e2..dde1f6c59d 100644 --- a/vendor/github.com/docker/docker/client/task_inspect.go +++ b/vendor/github.com/docker/docker/client/task_inspect.go @@ -17,7 +17,7 @@ func (cli *Client) TaskInspectWithRaw(ctx context.Context, taskID string) (swarm serverResp, err := cli.get(ctx, "/tasks/"+taskID, nil, nil) defer ensureReaderClosed(serverResp) if err != nil { - return swarm.Task{}, nil, wrapResponseError(err, serverResp, "task", taskID) + return swarm.Task{}, nil, err } body, err := io.ReadAll(serverResp.body) diff --git a/vendor/github.com/docker/docker/client/volume_inspect.go b/vendor/github.com/docker/docker/client/volume_inspect.go index 5c5b3f905c..070209b35e 100644 --- a/vendor/github.com/docker/docker/client/volume_inspect.go +++ b/vendor/github.com/docker/docker/client/volume_inspect.go @@ -25,7 +25,7 @@ func (cli *Client) VolumeInspectWithRaw(ctx context.Context, volumeID string) (t resp, err := cli.get(ctx, "/volumes/"+volumeID, nil, nil) defer ensureReaderClosed(resp) if err != nil { - return volume, nil, wrapResponseError(err, resp, "volume", volumeID) + return volume, nil, err } body, err := io.ReadAll(resp.body) diff --git a/vendor/github.com/docker/docker/client/volume_remove.go b/vendor/github.com/docker/docker/client/volume_remove.go index 79decdafab..1f26438360 100644 --- a/vendor/github.com/docker/docker/client/volume_remove.go +++ b/vendor/github.com/docker/docker/client/volume_remove.go @@ -17,5 +17,5 @@ func (cli *Client) VolumeRemove(ctx context.Context, volumeID string, force bool } resp, err := cli.delete(ctx, "/volumes/"+volumeID, query, nil) defer ensureReaderClosed(resp) - return wrapResponseError(err, resp, "volume", volumeID) + return err } diff --git a/vendor/github.com/docker/docker/errdefs/http_helpers.go b/vendor/github.com/docker/docker/errdefs/http_helpers.go index 73576f1c6e..5afe486779 100644 --- a/vendor/github.com/docker/docker/errdefs/http_helpers.go +++ b/vendor/github.com/docker/docker/errdefs/http_helpers.go @@ -1,78 +1,11 @@ package errdefs // import "github.com/docker/docker/errdefs" import ( - "fmt" "net/http" - containerderrors "github.com/containerd/containerd/errdefs" - "github.com/docker/distribution/registry/api/errcode" "github.com/sirupsen/logrus" - "google.golang.org/grpc/codes" - "google.golang.org/grpc/status" ) -// GetHTTPErrorStatusCode retrieves status code from error message. -func GetHTTPErrorStatusCode(err error) int { - if err == nil { - logrus.WithFields(logrus.Fields{"error": err}).Error("unexpected HTTP error handling") - return http.StatusInternalServerError - } - - var statusCode int - - // Stop right there - // Are you sure you should be adding a new error class here? Do one of the existing ones work? - - // Note that the below functions are already checking the error causal chain for matches. - switch { - case IsNotFound(err): - statusCode = http.StatusNotFound - case IsInvalidParameter(err): - statusCode = http.StatusBadRequest - case IsConflict(err): - statusCode = http.StatusConflict - case IsUnauthorized(err): - statusCode = http.StatusUnauthorized - case IsUnavailable(err): - statusCode = http.StatusServiceUnavailable - case IsForbidden(err): - statusCode = http.StatusForbidden - case IsNotModified(err): - statusCode = http.StatusNotModified - case IsNotImplemented(err): - statusCode = http.StatusNotImplemented - case IsSystem(err) || IsUnknown(err) || IsDataLoss(err) || IsDeadline(err) || IsCancelled(err): - statusCode = http.StatusInternalServerError - default: - statusCode = statusCodeFromGRPCError(err) - if statusCode != http.StatusInternalServerError { - return statusCode - } - statusCode = statusCodeFromContainerdError(err) - if statusCode != http.StatusInternalServerError { - return statusCode - } - statusCode = statusCodeFromDistributionError(err) - if statusCode != http.StatusInternalServerError { - return statusCode - } - if e, ok := err.(causer); ok { - return GetHTTPErrorStatusCode(e.Cause()) - } - - logrus.WithFields(logrus.Fields{ - "module": "api", - "error_type": fmt.Sprintf("%T", err), - }).Debugf("FIXME: Got an API for which error does not match any expected type!!!: %+v", err) - } - - if statusCode == 0 { - statusCode = http.StatusInternalServerError - } - - return statusCode -} - // FromStatusCode creates an errdef error, based on the provided HTTP status-code func FromStatusCode(err error, statusCode int) error { if err == nil { @@ -118,74 +51,3 @@ func FromStatusCode(err error, statusCode int) error { } return err } - -// statusCodeFromGRPCError returns status code according to gRPC error -func statusCodeFromGRPCError(err error) int { - switch status.Code(err) { - case codes.InvalidArgument: // code 3 - return http.StatusBadRequest - case codes.NotFound: // code 5 - return http.StatusNotFound - case codes.AlreadyExists: // code 6 - return http.StatusConflict - case codes.PermissionDenied: // code 7 - return http.StatusForbidden - case codes.FailedPrecondition: // code 9 - return http.StatusBadRequest - case codes.Unauthenticated: // code 16 - return http.StatusUnauthorized - case codes.OutOfRange: // code 11 - return http.StatusBadRequest - case codes.Unimplemented: // code 12 - return http.StatusNotImplemented - case codes.Unavailable: // code 14 - return http.StatusServiceUnavailable - default: - // codes.Canceled(1) - // codes.Unknown(2) - // codes.DeadlineExceeded(4) - // codes.ResourceExhausted(8) - // codes.Aborted(10) - // codes.Internal(13) - // codes.DataLoss(15) - return http.StatusInternalServerError - } -} - -// statusCodeFromDistributionError returns status code according to registry errcode -// code is loosely based on errcode.ServeJSON() in docker/distribution -func statusCodeFromDistributionError(err error) int { - switch errs := err.(type) { - case errcode.Errors: - if len(errs) < 1 { - return http.StatusInternalServerError - } - if _, ok := errs[0].(errcode.ErrorCoder); ok { - return statusCodeFromDistributionError(errs[0]) - } - case errcode.ErrorCoder: - return errs.ErrorCode().Descriptor().HTTPStatusCode - } - return http.StatusInternalServerError -} - -// statusCodeFromContainerdError returns status code for containerd errors when -// consumed directly (not through gRPC) -func statusCodeFromContainerdError(err error) int { - switch { - case containerderrors.IsInvalidArgument(err): - return http.StatusBadRequest - case containerderrors.IsNotFound(err): - return http.StatusNotFound - case containerderrors.IsAlreadyExists(err): - return http.StatusConflict - case containerderrors.IsFailedPrecondition(err): - return http.StatusPreconditionFailed - case containerderrors.IsUnavailable(err): - return http.StatusServiceUnavailable - case containerderrors.IsNotImplemented(err): - return http.StatusNotImplemented - default: - return http.StatusInternalServerError - } -} diff --git a/vendor/github.com/gogo/protobuf/protobuf/Makefile b/vendor/github.com/gogo/protobuf/protobuf/Makefile new file mode 100644 index 0000000000..e3e107663e --- /dev/null +++ b/vendor/github.com/gogo/protobuf/protobuf/Makefile @@ -0,0 +1,65 @@ +VERSION=3.9.1 +URL="https://raw.githubusercontent.com/protocolbuffers/protobuf/v${VERSION}/src/google/protobuf" + +regenerate: + go install github.com/gogo/protobuf/protoc-gen-gogotypes + go install github.com/gogo/protobuf/protoc-min-version + + protoc-min-version \ + --version="3.0.0" \ + --gogotypes_out=../types/ \ + -I=. \ + google/protobuf/any.proto \ + google/protobuf/type.proto \ + google/protobuf/empty.proto \ + google/protobuf/api.proto \ + google/protobuf/timestamp.proto \ + google/protobuf/duration.proto \ + google/protobuf/struct.proto \ + google/protobuf/wrappers.proto \ + google/protobuf/field_mask.proto \ + google/protobuf/source_context.proto + + mv ../types/google/protobuf/*.pb.go ../types/ || true + rmdir ../types/google/protobuf || true + rmdir ../types/google || true + +update: + go install github.com/gogo/protobuf/gogoreplace + + (cd ./google/protobuf && rm descriptor.proto; wget ${URL}/descriptor.proto) + # gogoprotobuf requires users to import gogo.proto which imports descriptor.proto + # The descriptor.proto is only compatible with proto3 just because of the reserved keyword. + # We remove it to stay compatible with previous versions of protoc before proto3 + gogoreplace 'reserved 38;' '//reserved 38;' ./google/protobuf/descriptor.proto + gogoreplace 'reserved 8;' '//reserved 8;' ./google/protobuf/descriptor.proto + gogoreplace 'reserved 9;' '//reserved 9;' ./google/protobuf/descriptor.proto + gogoreplace 'reserved 4;' '//reserved 4;' ./google/protobuf/descriptor.proto + gogoreplace 'reserved 5;' '//reserved 5;' ./google/protobuf/descriptor.proto + gogoreplace 'option go_package = "github.com/golang/protobuf/protoc-gen-go/descriptor;descriptor";' 'option go_package = "descriptor";' ./google/protobuf/descriptor.proto + + (cd ./google/protobuf/compiler && rm plugin.proto; wget ${URL}/compiler/plugin.proto) + gogoreplace 'option go_package = "github.com/golang/protobuf/protoc-gen-go/plugin;plugin_go";' 'option go_package = "plugin_go";' ./google/protobuf/compiler/plugin.proto + + (cd ./google/protobuf && rm any.proto; wget ${URL}/any.proto) + gogoreplace 'go_package = "github.com/golang/protobuf/ptypes/any";' 'go_package = "types";' ./google/protobuf/any.proto + (cd ./google/protobuf && rm empty.proto; wget ${URL}/empty.proto) + gogoreplace 'go_package = "github.com/golang/protobuf/ptypes/empty";' 'go_package = "types";' ./google/protobuf/empty.proto + (cd ./google/protobuf && rm timestamp.proto; wget ${URL}/timestamp.proto) + gogoreplace 'go_package = "github.com/golang/protobuf/ptypes/timestamp";' 'go_package = "types";' ./google/protobuf/timestamp.proto + (cd ./google/protobuf && rm duration.proto; wget ${URL}/duration.proto) + gogoreplace 'go_package = "github.com/golang/protobuf/ptypes/duration";' 'go_package = "types";' ./google/protobuf/duration.proto + (cd ./google/protobuf && rm struct.proto; wget ${URL}/struct.proto) + gogoreplace 'go_package = "github.com/golang/protobuf/ptypes/struct;structpb";' 'go_package = "types";' ./google/protobuf/struct.proto + (cd ./google/protobuf && rm wrappers.proto; wget ${URL}/wrappers.proto) + gogoreplace 'go_package = "github.com/golang/protobuf/ptypes/wrappers";' 'go_package = "types";' ./google/protobuf/wrappers.proto + (cd ./google/protobuf && rm field_mask.proto; wget ${URL}/field_mask.proto) + gogoreplace 'option go_package = "google.golang.org/genproto/protobuf/field_mask;field_mask";' 'option go_package = "types";' ./google/protobuf/field_mask.proto + (cd ./google/protobuf && rm api.proto; wget ${URL}/api.proto) + gogoreplace 'option go_package = "google.golang.org/genproto/protobuf/api;api";' 'option go_package = "types";' ./google/protobuf/api.proto + (cd ./google/protobuf && rm type.proto; wget ${URL}/type.proto) + gogoreplace 'option go_package = "google.golang.org/genproto/protobuf/ptype;ptype";' 'option go_package = "types";' ./google/protobuf/type.proto + (cd ./google/protobuf && rm source_context.proto; wget ${URL}/source_context.proto) + gogoreplace 'option go_package = "google.golang.org/genproto/protobuf/source_context;source_context";' 'option go_package = "types";' ./google/protobuf/source_context.proto + + diff --git a/vendor/github.com/gogo/protobuf/protobuf/google/protobuf/any.proto b/vendor/github.com/gogo/protobuf/protobuf/google/protobuf/any.proto new file mode 100644 index 0000000000..4cf3843bd7 --- /dev/null +++ b/vendor/github.com/gogo/protobuf/protobuf/google/protobuf/any.proto @@ -0,0 +1,155 @@ +// Protocol Buffers - Google's data interchange format +// Copyright 2008 Google Inc. All rights reserved. +// https://developers.google.com/protocol-buffers/ +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// * Redistributions in binary form must reproduce the above +// copyright notice, this list of conditions and the following disclaimer +// in the documentation and/or other materials provided with the +// distribution. +// * Neither the name of Google Inc. nor the names of its +// contributors may be used to endorse or promote products derived from +// this software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +syntax = "proto3"; + +package google.protobuf; + +option csharp_namespace = "Google.Protobuf.WellKnownTypes"; +option go_package = "types"; +option java_package = "com.google.protobuf"; +option java_outer_classname = "AnyProto"; +option java_multiple_files = true; +option objc_class_prefix = "GPB"; + +// `Any` contains an arbitrary serialized protocol buffer message along with a +// URL that describes the type of the serialized message. +// +// Protobuf library provides support to pack/unpack Any values in the form +// of utility functions or additional generated methods of the Any type. +// +// Example 1: Pack and unpack a message in C++. +// +// Foo foo = ...; +// Any any; +// any.PackFrom(foo); +// ... +// if (any.UnpackTo(&foo)) { +// ... +// } +// +// Example 2: Pack and unpack a message in Java. +// +// Foo foo = ...; +// Any any = Any.pack(foo); +// ... +// if (any.is(Foo.class)) { +// foo = any.unpack(Foo.class); +// } +// +// Example 3: Pack and unpack a message in Python. +// +// foo = Foo(...) +// any = Any() +// any.Pack(foo) +// ... +// if any.Is(Foo.DESCRIPTOR): +// any.Unpack(foo) +// ... +// +// Example 4: Pack and unpack a message in Go +// +// foo := &pb.Foo{...} +// any, err := ptypes.MarshalAny(foo) +// ... +// foo := &pb.Foo{} +// if err := ptypes.UnmarshalAny(any, foo); err != nil { +// ... +// } +// +// The pack methods provided by protobuf library will by default use +// 'type.googleapis.com/full.type.name' as the type URL and the unpack +// methods only use the fully qualified type name after the last '/' +// in the type URL, for example "foo.bar.com/x/y.z" will yield type +// name "y.z". +// +// +// JSON +// ==== +// The JSON representation of an `Any` value uses the regular +// representation of the deserialized, embedded message, with an +// additional field `@type` which contains the type URL. Example: +// +// package google.profile; +// message Person { +// string first_name = 1; +// string last_name = 2; +// } +// +// { +// "@type": "type.googleapis.com/google.profile.Person", +// "firstName": , +// "lastName": +// } +// +// If the embedded message type is well-known and has a custom JSON +// representation, that representation will be embedded adding a field +// `value` which holds the custom JSON in addition to the `@type` +// field. Example (for message [google.protobuf.Duration][]): +// +// { +// "@type": "type.googleapis.com/google.protobuf.Duration", +// "value": "1.212s" +// } +// +message Any { + // A URL/resource name that uniquely identifies the type of the serialized + // protocol buffer message. This string must contain at least + // one "/" character. The last segment of the URL's path must represent + // the fully qualified name of the type (as in + // `path/google.protobuf.Duration`). The name should be in a canonical form + // (e.g., leading "." is not accepted). + // + // In practice, teams usually precompile into the binary all types that they + // expect it to use in the context of Any. However, for URLs which use the + // scheme `http`, `https`, or no scheme, one can optionally set up a type + // server that maps type URLs to message definitions as follows: + // + // * If no scheme is provided, `https` is assumed. + // * An HTTP GET on the URL must yield a [google.protobuf.Type][] + // value in binary format, or produce an error. + // * Applications are allowed to cache lookup results based on the + // URL, or have them precompiled into a binary to avoid any + // lookup. Therefore, binary compatibility needs to be preserved + // on changes to types. (Use versioned type names to manage + // breaking changes.) + // + // Note: this functionality is not currently available in the official + // protobuf release, and it is not used for type URLs beginning with + // type.googleapis.com. + // + // Schemes other than `http`, `https` (or the empty scheme) might be + // used with implementation specific semantics. + // + string type_url = 1; + + // Must be a valid serialized protocol buffer of the above specified type. + bytes value = 2; +} diff --git a/vendor/github.com/gogo/protobuf/protobuf/google/protobuf/api.proto b/vendor/github.com/gogo/protobuf/protobuf/google/protobuf/api.proto new file mode 100644 index 0000000000..67c1ddbd9d --- /dev/null +++ b/vendor/github.com/gogo/protobuf/protobuf/google/protobuf/api.proto @@ -0,0 +1,210 @@ +// Protocol Buffers - Google's data interchange format +// Copyright 2008 Google Inc. All rights reserved. +// https://developers.google.com/protocol-buffers/ +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// * Redistributions in binary form must reproduce the above +// copyright notice, this list of conditions and the following disclaimer +// in the documentation and/or other materials provided with the +// distribution. +// * Neither the name of Google Inc. nor the names of its +// contributors may be used to endorse or promote products derived from +// this software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +syntax = "proto3"; + +package google.protobuf; + +import "google/protobuf/source_context.proto"; +import "google/protobuf/type.proto"; + +option csharp_namespace = "Google.Protobuf.WellKnownTypes"; +option java_package = "com.google.protobuf"; +option java_outer_classname = "ApiProto"; +option java_multiple_files = true; +option objc_class_prefix = "GPB"; +option go_package = "types"; + +// Api is a light-weight descriptor for an API Interface. +// +// Interfaces are also described as "protocol buffer services" in some contexts, +// such as by the "service" keyword in a .proto file, but they are different +// from API Services, which represent a concrete implementation of an interface +// as opposed to simply a description of methods and bindings. They are also +// sometimes simply referred to as "APIs" in other contexts, such as the name of +// this message itself. See https://cloud.google.com/apis/design/glossary for +// detailed terminology. +message Api { + + // The fully qualified name of this interface, including package name + // followed by the interface's simple name. + string name = 1; + + // The methods of this interface, in unspecified order. + repeated Method methods = 2; + + // Any metadata attached to the interface. + repeated Option options = 3; + + // A version string for this interface. If specified, must have the form + // `major-version.minor-version`, as in `1.10`. If the minor version is + // omitted, it defaults to zero. If the entire version field is empty, the + // major version is derived from the package name, as outlined below. If the + // field is not empty, the version in the package name will be verified to be + // consistent with what is provided here. + // + // The versioning schema uses [semantic + // versioning](http://semver.org) where the major version number + // indicates a breaking change and the minor version an additive, + // non-breaking change. Both version numbers are signals to users + // what to expect from different versions, and should be carefully + // chosen based on the product plan. + // + // The major version is also reflected in the package name of the + // interface, which must end in `v`, as in + // `google.feature.v1`. For major versions 0 and 1, the suffix can + // be omitted. Zero major versions must only be used for + // experimental, non-GA interfaces. + // + // + string version = 4; + + // Source context for the protocol buffer service represented by this + // message. + SourceContext source_context = 5; + + // Included interfaces. See [Mixin][]. + repeated Mixin mixins = 6; + + // The source syntax of the service. + Syntax syntax = 7; +} + +// Method represents a method of an API interface. +message Method { + + // The simple name of this method. + string name = 1; + + // A URL of the input message type. + string request_type_url = 2; + + // If true, the request is streamed. + bool request_streaming = 3; + + // The URL of the output message type. + string response_type_url = 4; + + // If true, the response is streamed. + bool response_streaming = 5; + + // Any metadata attached to the method. + repeated Option options = 6; + + // The source syntax of this method. + Syntax syntax = 7; +} + +// Declares an API Interface to be included in this interface. The including +// interface must redeclare all the methods from the included interface, but +// documentation and options are inherited as follows: +// +// - If after comment and whitespace stripping, the documentation +// string of the redeclared method is empty, it will be inherited +// from the original method. +// +// - Each annotation belonging to the service config (http, +// visibility) which is not set in the redeclared method will be +// inherited. +// +// - If an http annotation is inherited, the path pattern will be +// modified as follows. Any version prefix will be replaced by the +// version of the including interface plus the [root][] path if +// specified. +// +// Example of a simple mixin: +// +// package google.acl.v1; +// service AccessControl { +// // Get the underlying ACL object. +// rpc GetAcl(GetAclRequest) returns (Acl) { +// option (google.api.http).get = "/v1/{resource=**}:getAcl"; +// } +// } +// +// package google.storage.v2; +// service Storage { +// rpc GetAcl(GetAclRequest) returns (Acl); +// +// // Get a data record. +// rpc GetData(GetDataRequest) returns (Data) { +// option (google.api.http).get = "/v2/{resource=**}"; +// } +// } +// +// Example of a mixin configuration: +// +// apis: +// - name: google.storage.v2.Storage +// mixins: +// - name: google.acl.v1.AccessControl +// +// The mixin construct implies that all methods in `AccessControl` are +// also declared with same name and request/response types in +// `Storage`. A documentation generator or annotation processor will +// see the effective `Storage.GetAcl` method after inherting +// documentation and annotations as follows: +// +// service Storage { +// // Get the underlying ACL object. +// rpc GetAcl(GetAclRequest) returns (Acl) { +// option (google.api.http).get = "/v2/{resource=**}:getAcl"; +// } +// ... +// } +// +// Note how the version in the path pattern changed from `v1` to `v2`. +// +// If the `root` field in the mixin is specified, it should be a +// relative path under which inherited HTTP paths are placed. Example: +// +// apis: +// - name: google.storage.v2.Storage +// mixins: +// - name: google.acl.v1.AccessControl +// root: acls +// +// This implies the following inherited HTTP annotation: +// +// service Storage { +// // Get the underlying ACL object. +// rpc GetAcl(GetAclRequest) returns (Acl) { +// option (google.api.http).get = "/v2/acls/{resource=**}:getAcl"; +// } +// ... +// } +message Mixin { + // The fully qualified name of the interface which is included. + string name = 1; + + // If non-empty specifies a path under which inherited HTTP paths + // are rooted. + string root = 2; +} diff --git a/vendor/github.com/gogo/protobuf/protobuf/google/protobuf/compiler/plugin.proto b/vendor/github.com/gogo/protobuf/protobuf/google/protobuf/compiler/plugin.proto new file mode 100644 index 0000000000..4a88adf148 --- /dev/null +++ b/vendor/github.com/gogo/protobuf/protobuf/google/protobuf/compiler/plugin.proto @@ -0,0 +1,168 @@ +// Protocol Buffers - Google's data interchange format +// Copyright 2008 Google Inc. All rights reserved. +// https://developers.google.com/protocol-buffers/ +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// * Redistributions in binary form must reproduce the above +// copyright notice, this list of conditions and the following disclaimer +// in the documentation and/or other materials provided with the +// distribution. +// * Neither the name of Google Inc. nor the names of its +// contributors may be used to endorse or promote products derived from +// this software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +// Author: kenton@google.com (Kenton Varda) +// +// WARNING: The plugin interface is currently EXPERIMENTAL and is subject to +// change. +// +// protoc (aka the Protocol Compiler) can be extended via plugins. A plugin is +// just a program that reads a CodeGeneratorRequest from stdin and writes a +// CodeGeneratorResponse to stdout. +// +// Plugins written using C++ can use google/protobuf/compiler/plugin.h instead +// of dealing with the raw protocol defined here. +// +// A plugin executable needs only to be placed somewhere in the path. The +// plugin should be named "protoc-gen-$NAME", and will then be used when the +// flag "--${NAME}_out" is passed to protoc. + +syntax = "proto2"; + +package google.protobuf.compiler; +option java_package = "com.google.protobuf.compiler"; +option java_outer_classname = "PluginProtos"; + +option go_package = "plugin_go"; + +import "google/protobuf/descriptor.proto"; + +// The version number of protocol compiler. +message Version { + optional int32 major = 1; + optional int32 minor = 2; + optional int32 patch = 3; + // A suffix for alpha, beta or rc release, e.g., "alpha-1", "rc2". It should + // be empty for mainline stable releases. + optional string suffix = 4; +} + +// An encoded CodeGeneratorRequest is written to the plugin's stdin. +message CodeGeneratorRequest { + // The .proto files that were explicitly listed on the command-line. The + // code generator should generate code only for these files. Each file's + // descriptor will be included in proto_file, below. + repeated string file_to_generate = 1; + + // The generator parameter passed on the command-line. + optional string parameter = 2; + + // FileDescriptorProtos for all files in files_to_generate and everything + // they import. The files will appear in topological order, so each file + // appears before any file that imports it. + // + // protoc guarantees that all proto_files will be written after + // the fields above, even though this is not technically guaranteed by the + // protobuf wire format. This theoretically could allow a plugin to stream + // in the FileDescriptorProtos and handle them one by one rather than read + // the entire set into memory at once. However, as of this writing, this + // is not similarly optimized on protoc's end -- it will store all fields in + // memory at once before sending them to the plugin. + // + // Type names of fields and extensions in the FileDescriptorProto are always + // fully qualified. + repeated FileDescriptorProto proto_file = 15; + + // The version number of protocol compiler. + optional Version compiler_version = 3; + +} + +// The plugin writes an encoded CodeGeneratorResponse to stdout. +message CodeGeneratorResponse { + // Error message. If non-empty, code generation failed. The plugin process + // should exit with status code zero even if it reports an error in this way. + // + // This should be used to indicate errors in .proto files which prevent the + // code generator from generating correct code. Errors which indicate a + // problem in protoc itself -- such as the input CodeGeneratorRequest being + // unparseable -- should be reported by writing a message to stderr and + // exiting with a non-zero status code. + optional string error = 1; + + // Represents a single generated file. + message File { + // The file name, relative to the output directory. The name must not + // contain "." or ".." components and must be relative, not be absolute (so, + // the file cannot lie outside the output directory). "/" must be used as + // the path separator, not "\". + // + // If the name is omitted, the content will be appended to the previous + // file. This allows the generator to break large files into small chunks, + // and allows the generated text to be streamed back to protoc so that large + // files need not reside completely in memory at one time. Note that as of + // this writing protoc does not optimize for this -- it will read the entire + // CodeGeneratorResponse before writing files to disk. + optional string name = 1; + + // If non-empty, indicates that the named file should already exist, and the + // content here is to be inserted into that file at a defined insertion + // point. This feature allows a code generator to extend the output + // produced by another code generator. The original generator may provide + // insertion points by placing special annotations in the file that look + // like: + // @@protoc_insertion_point(NAME) + // The annotation can have arbitrary text before and after it on the line, + // which allows it to be placed in a comment. NAME should be replaced with + // an identifier naming the point -- this is what other generators will use + // as the insertion_point. Code inserted at this point will be placed + // immediately above the line containing the insertion point (thus multiple + // insertions to the same point will come out in the order they were added). + // The double-@ is intended to make it unlikely that the generated code + // could contain things that look like insertion points by accident. + // + // For example, the C++ code generator places the following line in the + // .pb.h files that it generates: + // // @@protoc_insertion_point(namespace_scope) + // This line appears within the scope of the file's package namespace, but + // outside of any particular class. Another plugin can then specify the + // insertion_point "namespace_scope" to generate additional classes or + // other declarations that should be placed in this scope. + // + // Note that if the line containing the insertion point begins with + // whitespace, the same whitespace will be added to every line of the + // inserted text. This is useful for languages like Python, where + // indentation matters. In these languages, the insertion point comment + // should be indented the same amount as any inserted code will need to be + // in order to work correctly in that context. + // + // The code generator that generates the initial file and the one which + // inserts into it must both run as part of a single invocation of protoc. + // Code generators are executed in the order in which they appear on the + // command line. + // + // If |insertion_point| is present, |name| must also be present. + optional string insertion_point = 2; + + // The file contents. + optional string content = 15; + } + repeated File file = 15; +} diff --git a/vendor/github.com/gogo/protobuf/protobuf/google/protobuf/descriptor.proto b/vendor/github.com/gogo/protobuf/protobuf/google/protobuf/descriptor.proto new file mode 100644 index 0000000000..4a08905a56 --- /dev/null +++ b/vendor/github.com/gogo/protobuf/protobuf/google/protobuf/descriptor.proto @@ -0,0 +1,885 @@ +// Protocol Buffers - Google's data interchange format +// Copyright 2008 Google Inc. All rights reserved. +// https://developers.google.com/protocol-buffers/ +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// * Redistributions in binary form must reproduce the above +// copyright notice, this list of conditions and the following disclaimer +// in the documentation and/or other materials provided with the +// distribution. +// * Neither the name of Google Inc. nor the names of its +// contributors may be used to endorse or promote products derived from +// this software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +// Author: kenton@google.com (Kenton Varda) +// Based on original Protocol Buffers design by +// Sanjay Ghemawat, Jeff Dean, and others. +// +// The messages in this file describe the definitions found in .proto files. +// A valid .proto file can be translated directly to a FileDescriptorProto +// without any other information (e.g. without reading its imports). + + +syntax = "proto2"; + +package google.protobuf; + +option go_package = "descriptor"; +option java_package = "com.google.protobuf"; +option java_outer_classname = "DescriptorProtos"; +option csharp_namespace = "Google.Protobuf.Reflection"; +option objc_class_prefix = "GPB"; +option cc_enable_arenas = true; + +// descriptor.proto must be optimized for speed because reflection-based +// algorithms don't work during bootstrapping. +option optimize_for = SPEED; + +// The protocol compiler can output a FileDescriptorSet containing the .proto +// files it parses. +message FileDescriptorSet { + repeated FileDescriptorProto file = 1; +} + +// Describes a complete .proto file. +message FileDescriptorProto { + optional string name = 1; // file name, relative to root of source tree + optional string package = 2; // e.g. "foo", "foo.bar", etc. + + // Names of files imported by this file. + repeated string dependency = 3; + // Indexes of the public imported files in the dependency list above. + repeated int32 public_dependency = 10; + // Indexes of the weak imported files in the dependency list. + // For Google-internal migration only. Do not use. + repeated int32 weak_dependency = 11; + + // All top-level definitions in this file. + repeated DescriptorProto message_type = 4; + repeated EnumDescriptorProto enum_type = 5; + repeated ServiceDescriptorProto service = 6; + repeated FieldDescriptorProto extension = 7; + + optional FileOptions options = 8; + + // This field contains optional information about the original source code. + // You may safely remove this entire field without harming runtime + // functionality of the descriptors -- the information is needed only by + // development tools. + optional SourceCodeInfo source_code_info = 9; + + // The syntax of the proto file. + // The supported values are "proto2" and "proto3". + optional string syntax = 12; +} + +// Describes a message type. +message DescriptorProto { + optional string name = 1; + + repeated FieldDescriptorProto field = 2; + repeated FieldDescriptorProto extension = 6; + + repeated DescriptorProto nested_type = 3; + repeated EnumDescriptorProto enum_type = 4; + + message ExtensionRange { + optional int32 start = 1; // Inclusive. + optional int32 end = 2; // Exclusive. + + optional ExtensionRangeOptions options = 3; + } + repeated ExtensionRange extension_range = 5; + + repeated OneofDescriptorProto oneof_decl = 8; + + optional MessageOptions options = 7; + + // Range of reserved tag numbers. Reserved tag numbers may not be used by + // fields or extension ranges in the same message. Reserved ranges may + // not overlap. + message ReservedRange { + optional int32 start = 1; // Inclusive. + optional int32 end = 2; // Exclusive. + } + repeated ReservedRange reserved_range = 9; + // Reserved field names, which may not be used by fields in the same message. + // A given name may only be reserved once. + repeated string reserved_name = 10; +} + +message ExtensionRangeOptions { + // The parser stores options it doesn't recognize here. See above. + repeated UninterpretedOption uninterpreted_option = 999; + + // Clients can define custom options in extensions of this message. See above. + extensions 1000 to max; +} + +// Describes a field within a message. +message FieldDescriptorProto { + enum Type { + // 0 is reserved for errors. + // Order is weird for historical reasons. + TYPE_DOUBLE = 1; + TYPE_FLOAT = 2; + // Not ZigZag encoded. Negative numbers take 10 bytes. Use TYPE_SINT64 if + // negative values are likely. + TYPE_INT64 = 3; + TYPE_UINT64 = 4; + // Not ZigZag encoded. Negative numbers take 10 bytes. Use TYPE_SINT32 if + // negative values are likely. + TYPE_INT32 = 5; + TYPE_FIXED64 = 6; + TYPE_FIXED32 = 7; + TYPE_BOOL = 8; + TYPE_STRING = 9; + // Tag-delimited aggregate. + // Group type is deprecated and not supported in proto3. However, Proto3 + // implementations should still be able to parse the group wire format and + // treat group fields as unknown fields. + TYPE_GROUP = 10; + TYPE_MESSAGE = 11; // Length-delimited aggregate. + + // New in version 2. + TYPE_BYTES = 12; + TYPE_UINT32 = 13; + TYPE_ENUM = 14; + TYPE_SFIXED32 = 15; + TYPE_SFIXED64 = 16; + TYPE_SINT32 = 17; // Uses ZigZag encoding. + TYPE_SINT64 = 18; // Uses ZigZag encoding. + } + + enum Label { + // 0 is reserved for errors + LABEL_OPTIONAL = 1; + LABEL_REQUIRED = 2; + LABEL_REPEATED = 3; + } + + optional string name = 1; + optional int32 number = 3; + optional Label label = 4; + + // If type_name is set, this need not be set. If both this and type_name + // are set, this must be one of TYPE_ENUM, TYPE_MESSAGE or TYPE_GROUP. + optional Type type = 5; + + // For message and enum types, this is the name of the type. If the name + // starts with a '.', it is fully-qualified. Otherwise, C++-like scoping + // rules are used to find the type (i.e. first the nested types within this + // message are searched, then within the parent, on up to the root + // namespace). + optional string type_name = 6; + + // For extensions, this is the name of the type being extended. It is + // resolved in the same manner as type_name. + optional string extendee = 2; + + // For numeric types, contains the original text representation of the value. + // For booleans, "true" or "false". + // For strings, contains the default text contents (not escaped in any way). + // For bytes, contains the C escaped value. All bytes >= 128 are escaped. + // TODO(kenton): Base-64 encode? + optional string default_value = 7; + + // If set, gives the index of a oneof in the containing type's oneof_decl + // list. This field is a member of that oneof. + optional int32 oneof_index = 9; + + // JSON name of this field. The value is set by protocol compiler. If the + // user has set a "json_name" option on this field, that option's value + // will be used. Otherwise, it's deduced from the field's name by converting + // it to camelCase. + optional string json_name = 10; + + optional FieldOptions options = 8; +} + +// Describes a oneof. +message OneofDescriptorProto { + optional string name = 1; + optional OneofOptions options = 2; +} + +// Describes an enum type. +message EnumDescriptorProto { + optional string name = 1; + + repeated EnumValueDescriptorProto value = 2; + + optional EnumOptions options = 3; + + // Range of reserved numeric values. Reserved values may not be used by + // entries in the same enum. Reserved ranges may not overlap. + // + // Note that this is distinct from DescriptorProto.ReservedRange in that it + // is inclusive such that it can appropriately represent the entire int32 + // domain. + message EnumReservedRange { + optional int32 start = 1; // Inclusive. + optional int32 end = 2; // Inclusive. + } + + // Range of reserved numeric values. Reserved numeric values may not be used + // by enum values in the same enum declaration. Reserved ranges may not + // overlap. + repeated EnumReservedRange reserved_range = 4; + + // Reserved enum value names, which may not be reused. A given name may only + // be reserved once. + repeated string reserved_name = 5; +} + +// Describes a value within an enum. +message EnumValueDescriptorProto { + optional string name = 1; + optional int32 number = 2; + + optional EnumValueOptions options = 3; +} + +// Describes a service. +message ServiceDescriptorProto { + optional string name = 1; + repeated MethodDescriptorProto method = 2; + + optional ServiceOptions options = 3; +} + +// Describes a method of a service. +message MethodDescriptorProto { + optional string name = 1; + + // Input and output type names. These are resolved in the same way as + // FieldDescriptorProto.type_name, but must refer to a message type. + optional string input_type = 2; + optional string output_type = 3; + + optional MethodOptions options = 4; + + // Identifies if client streams multiple client messages + optional bool client_streaming = 5 [default = false]; + // Identifies if server streams multiple server messages + optional bool server_streaming = 6 [default = false]; +} + + +// =================================================================== +// Options + +// Each of the definitions above may have "options" attached. These are +// just annotations which may cause code to be generated slightly differently +// or may contain hints for code that manipulates protocol messages. +// +// Clients may define custom options as extensions of the *Options messages. +// These extensions may not yet be known at parsing time, so the parser cannot +// store the values in them. Instead it stores them in a field in the *Options +// message called uninterpreted_option. This field must have the same name +// across all *Options messages. We then use this field to populate the +// extensions when we build a descriptor, at which point all protos have been +// parsed and so all extensions are known. +// +// Extension numbers for custom options may be chosen as follows: +// * For options which will only be used within a single application or +// organization, or for experimental options, use field numbers 50000 +// through 99999. It is up to you to ensure that you do not use the +// same number for multiple options. +// * For options which will be published and used publicly by multiple +// independent entities, e-mail protobuf-global-extension-registry@google.com +// to reserve extension numbers. Simply provide your project name (e.g. +// Objective-C plugin) and your project website (if available) -- there's no +// need to explain how you intend to use them. Usually you only need one +// extension number. You can declare multiple options with only one extension +// number by putting them in a sub-message. See the Custom Options section of +// the docs for examples: +// https://developers.google.com/protocol-buffers/docs/proto#options +// If this turns out to be popular, a web service will be set up +// to automatically assign option numbers. + +message FileOptions { + + // Sets the Java package where classes generated from this .proto will be + // placed. By default, the proto package is used, but this is often + // inappropriate because proto packages do not normally start with backwards + // domain names. + optional string java_package = 1; + + + // If set, all the classes from the .proto file are wrapped in a single + // outer class with the given name. This applies to both Proto1 + // (equivalent to the old "--one_java_file" option) and Proto2 (where + // a .proto always translates to a single class, but you may want to + // explicitly choose the class name). + optional string java_outer_classname = 8; + + // If set true, then the Java code generator will generate a separate .java + // file for each top-level message, enum, and service defined in the .proto + // file. Thus, these types will *not* be nested inside the outer class + // named by java_outer_classname. However, the outer class will still be + // generated to contain the file's getDescriptor() method as well as any + // top-level extensions defined in the file. + optional bool java_multiple_files = 10 [default = false]; + + // This option does nothing. + optional bool java_generate_equals_and_hash = 20 [deprecated=true]; + + // If set true, then the Java2 code generator will generate code that + // throws an exception whenever an attempt is made to assign a non-UTF-8 + // byte sequence to a string field. + // Message reflection will do the same. + // However, an extension field still accepts non-UTF-8 byte sequences. + // This option has no effect on when used with the lite runtime. + optional bool java_string_check_utf8 = 27 [default = false]; + + + // Generated classes can be optimized for speed or code size. + enum OptimizeMode { + SPEED = 1; // Generate complete code for parsing, serialization, + // etc. + CODE_SIZE = 2; // Use ReflectionOps to implement these methods. + LITE_RUNTIME = 3; // Generate code using MessageLite and the lite runtime. + } + optional OptimizeMode optimize_for = 9 [default = SPEED]; + + // Sets the Go package where structs generated from this .proto will be + // placed. If omitted, the Go package will be derived from the following: + // - The basename of the package import path, if provided. + // - Otherwise, the package statement in the .proto file, if present. + // - Otherwise, the basename of the .proto file, without extension. + optional string go_package = 11; + + + + + // Should generic services be generated in each language? "Generic" services + // are not specific to any particular RPC system. They are generated by the + // main code generators in each language (without additional plugins). + // Generic services were the only kind of service generation supported by + // early versions of google.protobuf. + // + // Generic services are now considered deprecated in favor of using plugins + // that generate code specific to your particular RPC system. Therefore, + // these default to false. Old code which depends on generic services should + // explicitly set them to true. + optional bool cc_generic_services = 16 [default = false]; + optional bool java_generic_services = 17 [default = false]; + optional bool py_generic_services = 18 [default = false]; + optional bool php_generic_services = 42 [default = false]; + + // Is this file deprecated? + // Depending on the target platform, this can emit Deprecated annotations + // for everything in the file, or it will be completely ignored; in the very + // least, this is a formalization for deprecating files. + optional bool deprecated = 23 [default = false]; + + // Enables the use of arenas for the proto messages in this file. This applies + // only to generated classes for C++. + optional bool cc_enable_arenas = 31 [default = false]; + + + // Sets the objective c class prefix which is prepended to all objective c + // generated classes from this .proto. There is no default. + optional string objc_class_prefix = 36; + + // Namespace for generated classes; defaults to the package. + optional string csharp_namespace = 37; + + // By default Swift generators will take the proto package and CamelCase it + // replacing '.' with underscore and use that to prefix the types/symbols + // defined. When this options is provided, they will use this value instead + // to prefix the types/symbols defined. + optional string swift_prefix = 39; + + // Sets the php class prefix which is prepended to all php generated classes + // from this .proto. Default is empty. + optional string php_class_prefix = 40; + + // Use this option to change the namespace of php generated classes. Default + // is empty. When this option is empty, the package name will be used for + // determining the namespace. + optional string php_namespace = 41; + + // Use this option to change the namespace of php generated metadata classes. + // Default is empty. When this option is empty, the proto file name will be + // used for determining the namespace. + optional string php_metadata_namespace = 44; + + // Use this option to change the package of ruby generated classes. Default + // is empty. When this option is not set, the package name will be used for + // determining the ruby package. + optional string ruby_package = 45; + + + // The parser stores options it doesn't recognize here. + // See the documentation for the "Options" section above. + repeated UninterpretedOption uninterpreted_option = 999; + + // Clients can define custom options in extensions of this message. + // See the documentation for the "Options" section above. + extensions 1000 to max; + + //reserved 38; +} + +message MessageOptions { + // Set true to use the old proto1 MessageSet wire format for extensions. + // This is provided for backwards-compatibility with the MessageSet wire + // format. You should not use this for any other reason: It's less + // efficient, has fewer features, and is more complicated. + // + // The message must be defined exactly as follows: + // message Foo { + // option message_set_wire_format = true; + // extensions 4 to max; + // } + // Note that the message cannot have any defined fields; MessageSets only + // have extensions. + // + // All extensions of your type must be singular messages; e.g. they cannot + // be int32s, enums, or repeated messages. + // + // Because this is an option, the above two restrictions are not enforced by + // the protocol compiler. + optional bool message_set_wire_format = 1 [default = false]; + + // Disables the generation of the standard "descriptor()" accessor, which can + // conflict with a field of the same name. This is meant to make migration + // from proto1 easier; new code should avoid fields named "descriptor". + optional bool no_standard_descriptor_accessor = 2 [default = false]; + + // Is this message deprecated? + // Depending on the target platform, this can emit Deprecated annotations + // for the message, or it will be completely ignored; in the very least, + // this is a formalization for deprecating messages. + optional bool deprecated = 3 [default = false]; + + // Whether the message is an automatically generated map entry type for the + // maps field. + // + // For maps fields: + // map map_field = 1; + // The parsed descriptor looks like: + // message MapFieldEntry { + // option map_entry = true; + // optional KeyType key = 1; + // optional ValueType value = 2; + // } + // repeated MapFieldEntry map_field = 1; + // + // Implementations may choose not to generate the map_entry=true message, but + // use a native map in the target language to hold the keys and values. + // The reflection APIs in such implementations still need to work as + // if the field is a repeated message field. + // + // NOTE: Do not set the option in .proto files. Always use the maps syntax + // instead. The option should only be implicitly set by the proto compiler + // parser. + optional bool map_entry = 7; + + //reserved 8; // javalite_serializable + //reserved 9; // javanano_as_lite + + + // The parser stores options it doesn't recognize here. See above. + repeated UninterpretedOption uninterpreted_option = 999; + + // Clients can define custom options in extensions of this message. See above. + extensions 1000 to max; +} + +message FieldOptions { + // The ctype option instructs the C++ code generator to use a different + // representation of the field than it normally would. See the specific + // options below. This option is not yet implemented in the open source + // release -- sorry, we'll try to include it in a future version! + optional CType ctype = 1 [default = STRING]; + enum CType { + // Default mode. + STRING = 0; + + CORD = 1; + + STRING_PIECE = 2; + } + // The packed option can be enabled for repeated primitive fields to enable + // a more efficient representation on the wire. Rather than repeatedly + // writing the tag and type for each element, the entire array is encoded as + // a single length-delimited blob. In proto3, only explicit setting it to + // false will avoid using packed encoding. + optional bool packed = 2; + + // The jstype option determines the JavaScript type used for values of the + // field. The option is permitted only for 64 bit integral and fixed types + // (int64, uint64, sint64, fixed64, sfixed64). A field with jstype JS_STRING + // is represented as JavaScript string, which avoids loss of precision that + // can happen when a large value is converted to a floating point JavaScript. + // Specifying JS_NUMBER for the jstype causes the generated JavaScript code to + // use the JavaScript "number" type. The behavior of the default option + // JS_NORMAL is implementation dependent. + // + // This option is an enum to permit additional types to be added, e.g. + // goog.math.Integer. + optional JSType jstype = 6 [default = JS_NORMAL]; + enum JSType { + // Use the default type. + JS_NORMAL = 0; + + // Use JavaScript strings. + JS_STRING = 1; + + // Use JavaScript numbers. + JS_NUMBER = 2; + } + + // Should this field be parsed lazily? Lazy applies only to message-type + // fields. It means that when the outer message is initially parsed, the + // inner message's contents will not be parsed but instead stored in encoded + // form. The inner message will actually be parsed when it is first accessed. + // + // This is only a hint. Implementations are free to choose whether to use + // eager or lazy parsing regardless of the value of this option. However, + // setting this option true suggests that the protocol author believes that + // using lazy parsing on this field is worth the additional bookkeeping + // overhead typically needed to implement it. + // + // This option does not affect the public interface of any generated code; + // all method signatures remain the same. Furthermore, thread-safety of the + // interface is not affected by this option; const methods remain safe to + // call from multiple threads concurrently, while non-const methods continue + // to require exclusive access. + // + // + // Note that implementations may choose not to check required fields within + // a lazy sub-message. That is, calling IsInitialized() on the outer message + // may return true even if the inner message has missing required fields. + // This is necessary because otherwise the inner message would have to be + // parsed in order to perform the check, defeating the purpose of lazy + // parsing. An implementation which chooses not to check required fields + // must be consistent about it. That is, for any particular sub-message, the + // implementation must either *always* check its required fields, or *never* + // check its required fields, regardless of whether or not the message has + // been parsed. + optional bool lazy = 5 [default = false]; + + // Is this field deprecated? + // Depending on the target platform, this can emit Deprecated annotations + // for accessors, or it will be completely ignored; in the very least, this + // is a formalization for deprecating fields. + optional bool deprecated = 3 [default = false]; + + // For Google-internal migration only. Do not use. + optional bool weak = 10 [default = false]; + + + // The parser stores options it doesn't recognize here. See above. + repeated UninterpretedOption uninterpreted_option = 999; + + // Clients can define custom options in extensions of this message. See above. + extensions 1000 to max; + + //reserved 4; // removed jtype +} + +message OneofOptions { + // The parser stores options it doesn't recognize here. See above. + repeated UninterpretedOption uninterpreted_option = 999; + + // Clients can define custom options in extensions of this message. See above. + extensions 1000 to max; +} + +message EnumOptions { + + // Set this option to true to allow mapping different tag names to the same + // value. + optional bool allow_alias = 2; + + // Is this enum deprecated? + // Depending on the target platform, this can emit Deprecated annotations + // for the enum, or it will be completely ignored; in the very least, this + // is a formalization for deprecating enums. + optional bool deprecated = 3 [default = false]; + + //reserved 5; // javanano_as_lite + + // The parser stores options it doesn't recognize here. See above. + repeated UninterpretedOption uninterpreted_option = 999; + + // Clients can define custom options in extensions of this message. See above. + extensions 1000 to max; +} + +message EnumValueOptions { + // Is this enum value deprecated? + // Depending on the target platform, this can emit Deprecated annotations + // for the enum value, or it will be completely ignored; in the very least, + // this is a formalization for deprecating enum values. + optional bool deprecated = 1 [default = false]; + + // The parser stores options it doesn't recognize here. See above. + repeated UninterpretedOption uninterpreted_option = 999; + + // Clients can define custom options in extensions of this message. See above. + extensions 1000 to max; +} + +message ServiceOptions { + + // Note: Field numbers 1 through 32 are reserved for Google's internal RPC + // framework. We apologize for hoarding these numbers to ourselves, but + // we were already using them long before we decided to release Protocol + // Buffers. + + // Is this service deprecated? + // Depending on the target platform, this can emit Deprecated annotations + // for the service, or it will be completely ignored; in the very least, + // this is a formalization for deprecating services. + optional bool deprecated = 33 [default = false]; + + // The parser stores options it doesn't recognize here. See above. + repeated UninterpretedOption uninterpreted_option = 999; + + // Clients can define custom options in extensions of this message. See above. + extensions 1000 to max; +} + +message MethodOptions { + + // Note: Field numbers 1 through 32 are reserved for Google's internal RPC + // framework. We apologize for hoarding these numbers to ourselves, but + // we were already using them long before we decided to release Protocol + // Buffers. + + // Is this method deprecated? + // Depending on the target platform, this can emit Deprecated annotations + // for the method, or it will be completely ignored; in the very least, + // this is a formalization for deprecating methods. + optional bool deprecated = 33 [default = false]; + + // Is this method side-effect-free (or safe in HTTP parlance), or idempotent, + // or neither? HTTP based RPC implementation may choose GET verb for safe + // methods, and PUT verb for idempotent methods instead of the default POST. + enum IdempotencyLevel { + IDEMPOTENCY_UNKNOWN = 0; + NO_SIDE_EFFECTS = 1; // implies idempotent + IDEMPOTENT = 2; // idempotent, but may have side effects + } + optional IdempotencyLevel idempotency_level = 34 + [default = IDEMPOTENCY_UNKNOWN]; + + // The parser stores options it doesn't recognize here. See above. + repeated UninterpretedOption uninterpreted_option = 999; + + // Clients can define custom options in extensions of this message. See above. + extensions 1000 to max; +} + + +// A message representing a option the parser does not recognize. This only +// appears in options protos created by the compiler::Parser class. +// DescriptorPool resolves these when building Descriptor objects. Therefore, +// options protos in descriptor objects (e.g. returned by Descriptor::options(), +// or produced by Descriptor::CopyTo()) will never have UninterpretedOptions +// in them. +message UninterpretedOption { + // The name of the uninterpreted option. Each string represents a segment in + // a dot-separated name. is_extension is true iff a segment represents an + // extension (denoted with parentheses in options specs in .proto files). + // E.g.,{ ["foo", false], ["bar.baz", true], ["qux", false] } represents + // "foo.(bar.baz).qux". + message NamePart { + required string name_part = 1; + required bool is_extension = 2; + } + repeated NamePart name = 2; + + // The value of the uninterpreted option, in whatever type the tokenizer + // identified it as during parsing. Exactly one of these should be set. + optional string identifier_value = 3; + optional uint64 positive_int_value = 4; + optional int64 negative_int_value = 5; + optional double double_value = 6; + optional bytes string_value = 7; + optional string aggregate_value = 8; +} + +// =================================================================== +// Optional source code info + +// Encapsulates information about the original source file from which a +// FileDescriptorProto was generated. +message SourceCodeInfo { + // A Location identifies a piece of source code in a .proto file which + // corresponds to a particular definition. This information is intended + // to be useful to IDEs, code indexers, documentation generators, and similar + // tools. + // + // For example, say we have a file like: + // message Foo { + // optional string foo = 1; + // } + // Let's look at just the field definition: + // optional string foo = 1; + // ^ ^^ ^^ ^ ^^^ + // a bc de f ghi + // We have the following locations: + // span path represents + // [a,i) [ 4, 0, 2, 0 ] The whole field definition. + // [a,b) [ 4, 0, 2, 0, 4 ] The label (optional). + // [c,d) [ 4, 0, 2, 0, 5 ] The type (string). + // [e,f) [ 4, 0, 2, 0, 1 ] The name (foo). + // [g,h) [ 4, 0, 2, 0, 3 ] The number (1). + // + // Notes: + // - A location may refer to a repeated field itself (i.e. not to any + // particular index within it). This is used whenever a set of elements are + // logically enclosed in a single code segment. For example, an entire + // extend block (possibly containing multiple extension definitions) will + // have an outer location whose path refers to the "extensions" repeated + // field without an index. + // - Multiple locations may have the same path. This happens when a single + // logical declaration is spread out across multiple places. The most + // obvious example is the "extend" block again -- there may be multiple + // extend blocks in the same scope, each of which will have the same path. + // - A location's span is not always a subset of its parent's span. For + // example, the "extendee" of an extension declaration appears at the + // beginning of the "extend" block and is shared by all extensions within + // the block. + // - Just because a location's span is a subset of some other location's span + // does not mean that it is a descendant. For example, a "group" defines + // both a type and a field in a single declaration. Thus, the locations + // corresponding to the type and field and their components will overlap. + // - Code which tries to interpret locations should probably be designed to + // ignore those that it doesn't understand, as more types of locations could + // be recorded in the future. + repeated Location location = 1; + message Location { + // Identifies which part of the FileDescriptorProto was defined at this + // location. + // + // Each element is a field number or an index. They form a path from + // the root FileDescriptorProto to the place where the definition. For + // example, this path: + // [ 4, 3, 2, 7, 1 ] + // refers to: + // file.message_type(3) // 4, 3 + // .field(7) // 2, 7 + // .name() // 1 + // This is because FileDescriptorProto.message_type has field number 4: + // repeated DescriptorProto message_type = 4; + // and DescriptorProto.field has field number 2: + // repeated FieldDescriptorProto field = 2; + // and FieldDescriptorProto.name has field number 1: + // optional string name = 1; + // + // Thus, the above path gives the location of a field name. If we removed + // the last element: + // [ 4, 3, 2, 7 ] + // this path refers to the whole field declaration (from the beginning + // of the label to the terminating semicolon). + repeated int32 path = 1 [packed = true]; + + // Always has exactly three or four elements: start line, start column, + // end line (optional, otherwise assumed same as start line), end column. + // These are packed into a single field for efficiency. Note that line + // and column numbers are zero-based -- typically you will want to add + // 1 to each before displaying to a user. + repeated int32 span = 2 [packed = true]; + + // If this SourceCodeInfo represents a complete declaration, these are any + // comments appearing before and after the declaration which appear to be + // attached to the declaration. + // + // A series of line comments appearing on consecutive lines, with no other + // tokens appearing on those lines, will be treated as a single comment. + // + // leading_detached_comments will keep paragraphs of comments that appear + // before (but not connected to) the current element. Each paragraph, + // separated by empty lines, will be one comment element in the repeated + // field. + // + // Only the comment content is provided; comment markers (e.g. //) are + // stripped out. For block comments, leading whitespace and an asterisk + // will be stripped from the beginning of each line other than the first. + // Newlines are included in the output. + // + // Examples: + // + // optional int32 foo = 1; // Comment attached to foo. + // // Comment attached to bar. + // optional int32 bar = 2; + // + // optional string baz = 3; + // // Comment attached to baz. + // // Another line attached to baz. + // + // // Comment attached to qux. + // // + // // Another line attached to qux. + // optional double qux = 4; + // + // // Detached comment for corge. This is not leading or trailing comments + // // to qux or corge because there are blank lines separating it from + // // both. + // + // // Detached comment for corge paragraph 2. + // + // optional string corge = 5; + // /* Block comment attached + // * to corge. Leading asterisks + // * will be removed. */ + // /* Block comment attached to + // * grault. */ + // optional int32 grault = 6; + // + // // ignored detached comments. + optional string leading_comments = 3; + optional string trailing_comments = 4; + repeated string leading_detached_comments = 6; + } +} + +// Describes the relationship between generated code and its original source +// file. A GeneratedCodeInfo message is associated with only one generated +// source file, but may contain references to different source .proto files. +message GeneratedCodeInfo { + // An Annotation connects some span of text in generated code to an element + // of its generating .proto file. + repeated Annotation annotation = 1; + message Annotation { + // Identifies the element in the original source .proto file. This field + // is formatted the same as SourceCodeInfo.Location.path. + repeated int32 path = 1 [packed = true]; + + // Identifies the filesystem path to the original source .proto. + optional string source_file = 2; + + // Identifies the starting offset in bytes in the generated code + // that relates to the identified object. + optional int32 begin = 3; + + // Identifies the ending offset in bytes in the generated code that + // relates to the identified offset. The end offset should be one past + // the last relevant byte (so the length of the text = end - begin). + optional int32 end = 4; + } +} diff --git a/vendor/github.com/gogo/protobuf/protobuf/google/protobuf/duration.proto b/vendor/github.com/gogo/protobuf/protobuf/google/protobuf/duration.proto new file mode 100644 index 0000000000..b14bea5d01 --- /dev/null +++ b/vendor/github.com/gogo/protobuf/protobuf/google/protobuf/duration.proto @@ -0,0 +1,116 @@ +// Protocol Buffers - Google's data interchange format +// Copyright 2008 Google Inc. All rights reserved. +// https://developers.google.com/protocol-buffers/ +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// * Redistributions in binary form must reproduce the above +// copyright notice, this list of conditions and the following disclaimer +// in the documentation and/or other materials provided with the +// distribution. +// * Neither the name of Google Inc. nor the names of its +// contributors may be used to endorse or promote products derived from +// this software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +syntax = "proto3"; + +package google.protobuf; + +option csharp_namespace = "Google.Protobuf.WellKnownTypes"; +option cc_enable_arenas = true; +option go_package = "types"; +option java_package = "com.google.protobuf"; +option java_outer_classname = "DurationProto"; +option java_multiple_files = true; +option objc_class_prefix = "GPB"; + +// A Duration represents a signed, fixed-length span of time represented +// as a count of seconds and fractions of seconds at nanosecond +// resolution. It is independent of any calendar and concepts like "day" +// or "month". It is related to Timestamp in that the difference between +// two Timestamp values is a Duration and it can be added or subtracted +// from a Timestamp. Range is approximately +-10,000 years. +// +// # Examples +// +// Example 1: Compute Duration from two Timestamps in pseudo code. +// +// Timestamp start = ...; +// Timestamp end = ...; +// Duration duration = ...; +// +// duration.seconds = end.seconds - start.seconds; +// duration.nanos = end.nanos - start.nanos; +// +// if (duration.seconds < 0 && duration.nanos > 0) { +// duration.seconds += 1; +// duration.nanos -= 1000000000; +// } else if (durations.seconds > 0 && duration.nanos < 0) { +// duration.seconds -= 1; +// duration.nanos += 1000000000; +// } +// +// Example 2: Compute Timestamp from Timestamp + Duration in pseudo code. +// +// Timestamp start = ...; +// Duration duration = ...; +// Timestamp end = ...; +// +// end.seconds = start.seconds + duration.seconds; +// end.nanos = start.nanos + duration.nanos; +// +// if (end.nanos < 0) { +// end.seconds -= 1; +// end.nanos += 1000000000; +// } else if (end.nanos >= 1000000000) { +// end.seconds += 1; +// end.nanos -= 1000000000; +// } +// +// Example 3: Compute Duration from datetime.timedelta in Python. +// +// td = datetime.timedelta(days=3, minutes=10) +// duration = Duration() +// duration.FromTimedelta(td) +// +// # JSON Mapping +// +// In JSON format, the Duration type is encoded as a string rather than an +// object, where the string ends in the suffix "s" (indicating seconds) and +// is preceded by the number of seconds, with nanoseconds expressed as +// fractional seconds. For example, 3 seconds with 0 nanoseconds should be +// encoded in JSON format as "3s", while 3 seconds and 1 nanosecond should +// be expressed in JSON format as "3.000000001s", and 3 seconds and 1 +// microsecond should be expressed in JSON format as "3.000001s". +// +// +message Duration { + // Signed seconds of the span of time. Must be from -315,576,000,000 + // to +315,576,000,000 inclusive. Note: these bounds are computed from: + // 60 sec/min * 60 min/hr * 24 hr/day * 365.25 days/year * 10000 years + int64 seconds = 1; + + // Signed fractions of a second at nanosecond resolution of the span + // of time. Durations less than one second are represented with a 0 + // `seconds` field and a positive or negative `nanos` field. For durations + // of one second or more, a non-zero value for the `nanos` field must be + // of the same sign as the `seconds` field. Must be from -999,999,999 + // to +999,999,999 inclusive. + int32 nanos = 2; +} diff --git a/vendor/github.com/gogo/protobuf/protobuf/google/protobuf/empty.proto b/vendor/github.com/gogo/protobuf/protobuf/google/protobuf/empty.proto new file mode 100644 index 0000000000..6057c8522d --- /dev/null +++ b/vendor/github.com/gogo/protobuf/protobuf/google/protobuf/empty.proto @@ -0,0 +1,52 @@ +// Protocol Buffers - Google's data interchange format +// Copyright 2008 Google Inc. All rights reserved. +// https://developers.google.com/protocol-buffers/ +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// * Redistributions in binary form must reproduce the above +// copyright notice, this list of conditions and the following disclaimer +// in the documentation and/or other materials provided with the +// distribution. +// * Neither the name of Google Inc. nor the names of its +// contributors may be used to endorse or promote products derived from +// this software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +syntax = "proto3"; + +package google.protobuf; + +option csharp_namespace = "Google.Protobuf.WellKnownTypes"; +option go_package = "types"; +option java_package = "com.google.protobuf"; +option java_outer_classname = "EmptyProto"; +option java_multiple_files = true; +option objc_class_prefix = "GPB"; +option cc_enable_arenas = true; + +// A generic empty message that you can re-use to avoid defining duplicated +// empty messages in your APIs. A typical example is to use it as the request +// or the response type of an API method. For instance: +// +// service Foo { +// rpc Bar(google.protobuf.Empty) returns (google.protobuf.Empty); +// } +// +// The JSON representation for `Empty` is empty JSON object `{}`. +message Empty {} diff --git a/vendor/github.com/gogo/protobuf/protobuf/google/protobuf/field_mask.proto b/vendor/github.com/gogo/protobuf/protobuf/google/protobuf/field_mask.proto new file mode 100644 index 0000000000..7b77007b7e --- /dev/null +++ b/vendor/github.com/gogo/protobuf/protobuf/google/protobuf/field_mask.proto @@ -0,0 +1,245 @@ +// Protocol Buffers - Google's data interchange format +// Copyright 2008 Google Inc. All rights reserved. +// https://developers.google.com/protocol-buffers/ +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// * Redistributions in binary form must reproduce the above +// copyright notice, this list of conditions and the following disclaimer +// in the documentation and/or other materials provided with the +// distribution. +// * Neither the name of Google Inc. nor the names of its +// contributors may be used to endorse or promote products derived from +// this software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +syntax = "proto3"; + +package google.protobuf; + +option csharp_namespace = "Google.Protobuf.WellKnownTypes"; +option java_package = "com.google.protobuf"; +option java_outer_classname = "FieldMaskProto"; +option java_multiple_files = true; +option objc_class_prefix = "GPB"; +option go_package = "types"; +option cc_enable_arenas = true; + +// `FieldMask` represents a set of symbolic field paths, for example: +// +// paths: "f.a" +// paths: "f.b.d" +// +// Here `f` represents a field in some root message, `a` and `b` +// fields in the message found in `f`, and `d` a field found in the +// message in `f.b`. +// +// Field masks are used to specify a subset of fields that should be +// returned by a get operation or modified by an update operation. +// Field masks also have a custom JSON encoding (see below). +// +// # Field Masks in Projections +// +// When used in the context of a projection, a response message or +// sub-message is filtered by the API to only contain those fields as +// specified in the mask. For example, if the mask in the previous +// example is applied to a response message as follows: +// +// f { +// a : 22 +// b { +// d : 1 +// x : 2 +// } +// y : 13 +// } +// z: 8 +// +// The result will not contain specific values for fields x,y and z +// (their value will be set to the default, and omitted in proto text +// output): +// +// +// f { +// a : 22 +// b { +// d : 1 +// } +// } +// +// A repeated field is not allowed except at the last position of a +// paths string. +// +// If a FieldMask object is not present in a get operation, the +// operation applies to all fields (as if a FieldMask of all fields +// had been specified). +// +// Note that a field mask does not necessarily apply to the +// top-level response message. In case of a REST get operation, the +// field mask applies directly to the response, but in case of a REST +// list operation, the mask instead applies to each individual message +// in the returned resource list. In case of a REST custom method, +// other definitions may be used. Where the mask applies will be +// clearly documented together with its declaration in the API. In +// any case, the effect on the returned resource/resources is required +// behavior for APIs. +// +// # Field Masks in Update Operations +// +// A field mask in update operations specifies which fields of the +// targeted resource are going to be updated. The API is required +// to only change the values of the fields as specified in the mask +// and leave the others untouched. If a resource is passed in to +// describe the updated values, the API ignores the values of all +// fields not covered by the mask. +// +// If a repeated field is specified for an update operation, new values will +// be appended to the existing repeated field in the target resource. Note that +// a repeated field is only allowed in the last position of a `paths` string. +// +// If a sub-message is specified in the last position of the field mask for an +// update operation, then new value will be merged into the existing sub-message +// in the target resource. +// +// For example, given the target message: +// +// f { +// b { +// d: 1 +// x: 2 +// } +// c: [1] +// } +// +// And an update message: +// +// f { +// b { +// d: 10 +// } +// c: [2] +// } +// +// then if the field mask is: +// +// paths: ["f.b", "f.c"] +// +// then the result will be: +// +// f { +// b { +// d: 10 +// x: 2 +// } +// c: [1, 2] +// } +// +// An implementation may provide options to override this default behavior for +// repeated and message fields. +// +// In order to reset a field's value to the default, the field must +// be in the mask and set to the default value in the provided resource. +// Hence, in order to reset all fields of a resource, provide a default +// instance of the resource and set all fields in the mask, or do +// not provide a mask as described below. +// +// If a field mask is not present on update, the operation applies to +// all fields (as if a field mask of all fields has been specified). +// Note that in the presence of schema evolution, this may mean that +// fields the client does not know and has therefore not filled into +// the request will be reset to their default. If this is unwanted +// behavior, a specific service may require a client to always specify +// a field mask, producing an error if not. +// +// As with get operations, the location of the resource which +// describes the updated values in the request message depends on the +// operation kind. In any case, the effect of the field mask is +// required to be honored by the API. +// +// ## Considerations for HTTP REST +// +// The HTTP kind of an update operation which uses a field mask must +// be set to PATCH instead of PUT in order to satisfy HTTP semantics +// (PUT must only be used for full updates). +// +// # JSON Encoding of Field Masks +// +// In JSON, a field mask is encoded as a single string where paths are +// separated by a comma. Fields name in each path are converted +// to/from lower-camel naming conventions. +// +// As an example, consider the following message declarations: +// +// message Profile { +// User user = 1; +// Photo photo = 2; +// } +// message User { +// string display_name = 1; +// string address = 2; +// } +// +// In proto a field mask for `Profile` may look as such: +// +// mask { +// paths: "user.display_name" +// paths: "photo" +// } +// +// In JSON, the same mask is represented as below: +// +// { +// mask: "user.displayName,photo" +// } +// +// # Field Masks and Oneof Fields +// +// Field masks treat fields in oneofs just as regular fields. Consider the +// following message: +// +// message SampleMessage { +// oneof test_oneof { +// string name = 4; +// SubMessage sub_message = 9; +// } +// } +// +// The field mask can be: +// +// mask { +// paths: "name" +// } +// +// Or: +// +// mask { +// paths: "sub_message" +// } +// +// Note that oneof type names ("test_oneof" in this case) cannot be used in +// paths. +// +// ## Field Mask Verification +// +// The implementation of any API method which has a FieldMask type field in the +// request should verify the included field paths, and return an +// `INVALID_ARGUMENT` error if any path is duplicated or unmappable. +message FieldMask { + // The set of field mask paths. + repeated string paths = 1; +} diff --git a/vendor/github.com/gogo/protobuf/protobuf/google/protobuf/source_context.proto b/vendor/github.com/gogo/protobuf/protobuf/google/protobuf/source_context.proto new file mode 100644 index 0000000000..8654578c77 --- /dev/null +++ b/vendor/github.com/gogo/protobuf/protobuf/google/protobuf/source_context.proto @@ -0,0 +1,48 @@ +// Protocol Buffers - Google's data interchange format +// Copyright 2008 Google Inc. All rights reserved. +// https://developers.google.com/protocol-buffers/ +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// * Redistributions in binary form must reproduce the above +// copyright notice, this list of conditions and the following disclaimer +// in the documentation and/or other materials provided with the +// distribution. +// * Neither the name of Google Inc. nor the names of its +// contributors may be used to endorse or promote products derived from +// this software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +syntax = "proto3"; + +package google.protobuf; + +option csharp_namespace = "Google.Protobuf.WellKnownTypes"; +option java_package = "com.google.protobuf"; +option java_outer_classname = "SourceContextProto"; +option java_multiple_files = true; +option objc_class_prefix = "GPB"; +option go_package = "types"; + +// `SourceContext` represents information about the source of a +// protobuf element, like the file in which it is defined. +message SourceContext { + // The path-qualified name of the .proto file that contained the associated + // protobuf element. For example: `"google/protobuf/source_context.proto"`. + string file_name = 1; +} diff --git a/vendor/github.com/gogo/protobuf/protobuf/google/protobuf/struct.proto b/vendor/github.com/gogo/protobuf/protobuf/google/protobuf/struct.proto new file mode 100644 index 0000000000..9db0771592 --- /dev/null +++ b/vendor/github.com/gogo/protobuf/protobuf/google/protobuf/struct.proto @@ -0,0 +1,95 @@ +// Protocol Buffers - Google's data interchange format +// Copyright 2008 Google Inc. All rights reserved. +// https://developers.google.com/protocol-buffers/ +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// * Redistributions in binary form must reproduce the above +// copyright notice, this list of conditions and the following disclaimer +// in the documentation and/or other materials provided with the +// distribution. +// * Neither the name of Google Inc. nor the names of its +// contributors may be used to endorse or promote products derived from +// this software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +syntax = "proto3"; + +package google.protobuf; + +option csharp_namespace = "Google.Protobuf.WellKnownTypes"; +option cc_enable_arenas = true; +option go_package = "types"; +option java_package = "com.google.protobuf"; +option java_outer_classname = "StructProto"; +option java_multiple_files = true; +option objc_class_prefix = "GPB"; + +// `Struct` represents a structured data value, consisting of fields +// which map to dynamically typed values. In some languages, `Struct` +// might be supported by a native representation. For example, in +// scripting languages like JS a struct is represented as an +// object. The details of that representation are described together +// with the proto support for the language. +// +// The JSON representation for `Struct` is JSON object. +message Struct { + // Unordered map of dynamically typed values. + map fields = 1; +} + +// `Value` represents a dynamically typed value which can be either +// null, a number, a string, a boolean, a recursive struct value, or a +// list of values. A producer of value is expected to set one of that +// variants, absence of any variant indicates an error. +// +// The JSON representation for `Value` is JSON value. +message Value { + // The kind of value. + oneof kind { + // Represents a null value. + NullValue null_value = 1; + // Represents a double value. + double number_value = 2; + // Represents a string value. + string string_value = 3; + // Represents a boolean value. + bool bool_value = 4; + // Represents a structured value. + Struct struct_value = 5; + // Represents a repeated `Value`. + ListValue list_value = 6; + } +} + +// `NullValue` is a singleton enumeration to represent the null value for the +// `Value` type union. +// +// The JSON representation for `NullValue` is JSON `null`. +enum NullValue { + // Null value. + NULL_VALUE = 0; +} + +// `ListValue` is a wrapper around a repeated field of values. +// +// The JSON representation for `ListValue` is JSON array. +message ListValue { + // Repeated field of dynamically typed values. + repeated Value values = 1; +} diff --git a/vendor/github.com/gogo/protobuf/protobuf/google/protobuf/timestamp.proto b/vendor/github.com/gogo/protobuf/protobuf/google/protobuf/timestamp.proto new file mode 100644 index 0000000000..0ebe36ea73 --- /dev/null +++ b/vendor/github.com/gogo/protobuf/protobuf/google/protobuf/timestamp.proto @@ -0,0 +1,138 @@ +// Protocol Buffers - Google's data interchange format +// Copyright 2008 Google Inc. All rights reserved. +// https://developers.google.com/protocol-buffers/ +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// * Redistributions in binary form must reproduce the above +// copyright notice, this list of conditions and the following disclaimer +// in the documentation and/or other materials provided with the +// distribution. +// * Neither the name of Google Inc. nor the names of its +// contributors may be used to endorse or promote products derived from +// this software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +syntax = "proto3"; + +package google.protobuf; + +option csharp_namespace = "Google.Protobuf.WellKnownTypes"; +option cc_enable_arenas = true; +option go_package = "types"; +option java_package = "com.google.protobuf"; +option java_outer_classname = "TimestampProto"; +option java_multiple_files = true; +option objc_class_prefix = "GPB"; + +// A Timestamp represents a point in time independent of any time zone or local +// calendar, encoded as a count of seconds and fractions of seconds at +// nanosecond resolution. The count is relative to an epoch at UTC midnight on +// January 1, 1970, in the proleptic Gregorian calendar which extends the +// Gregorian calendar backwards to year one. +// +// All minutes are 60 seconds long. Leap seconds are "smeared" so that no leap +// second table is needed for interpretation, using a [24-hour linear +// smear](https://developers.google.com/time/smear). +// +// The range is from 0001-01-01T00:00:00Z to 9999-12-31T23:59:59.999999999Z. By +// restricting to that range, we ensure that we can convert to and from [RFC +// 3339](https://www.ietf.org/rfc/rfc3339.txt) date strings. +// +// # Examples +// +// Example 1: Compute Timestamp from POSIX `time()`. +// +// Timestamp timestamp; +// timestamp.set_seconds(time(NULL)); +// timestamp.set_nanos(0); +// +// Example 2: Compute Timestamp from POSIX `gettimeofday()`. +// +// struct timeval tv; +// gettimeofday(&tv, NULL); +// +// Timestamp timestamp; +// timestamp.set_seconds(tv.tv_sec); +// timestamp.set_nanos(tv.tv_usec * 1000); +// +// Example 3: Compute Timestamp from Win32 `GetSystemTimeAsFileTime()`. +// +// FILETIME ft; +// GetSystemTimeAsFileTime(&ft); +// UINT64 ticks = (((UINT64)ft.dwHighDateTime) << 32) | ft.dwLowDateTime; +// +// // A Windows tick is 100 nanoseconds. Windows epoch 1601-01-01T00:00:00Z +// // is 11644473600 seconds before Unix epoch 1970-01-01T00:00:00Z. +// Timestamp timestamp; +// timestamp.set_seconds((INT64) ((ticks / 10000000) - 11644473600LL)); +// timestamp.set_nanos((INT32) ((ticks % 10000000) * 100)); +// +// Example 4: Compute Timestamp from Java `System.currentTimeMillis()`. +// +// long millis = System.currentTimeMillis(); +// +// Timestamp timestamp = Timestamp.newBuilder().setSeconds(millis / 1000) +// .setNanos((int) ((millis % 1000) * 1000000)).build(); +// +// +// Example 5: Compute Timestamp from current time in Python. +// +// timestamp = Timestamp() +// timestamp.GetCurrentTime() +// +// # JSON Mapping +// +// In JSON format, the Timestamp type is encoded as a string in the +// [RFC 3339](https://www.ietf.org/rfc/rfc3339.txt) format. That is, the +// format is "{year}-{month}-{day}T{hour}:{min}:{sec}[.{frac_sec}]Z" +// where {year} is always expressed using four digits while {month}, {day}, +// {hour}, {min}, and {sec} are zero-padded to two digits each. The fractional +// seconds, which can go up to 9 digits (i.e. up to 1 nanosecond resolution), +// are optional. The "Z" suffix indicates the timezone ("UTC"); the timezone +// is required. A proto3 JSON serializer should always use UTC (as indicated by +// "Z") when printing the Timestamp type and a proto3 JSON parser should be +// able to accept both UTC and other timezones (as indicated by an offset). +// +// For example, "2017-01-15T01:30:15.01Z" encodes 15.01 seconds past +// 01:30 UTC on January 15, 2017. +// +// In JavaScript, one can convert a Date object to this format using the +// standard +// [toISOString()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date/toISOString) +// method. In Python, a standard `datetime.datetime` object can be converted +// to this format using +// [`strftime`](https://docs.python.org/2/library/time.html#time.strftime) with +// the time format spec '%Y-%m-%dT%H:%M:%S.%fZ'. Likewise, in Java, one can use +// the Joda Time's [`ISODateTimeFormat.dateTime()`]( +// http://www.joda.org/joda-time/apidocs/org/joda/time/format/ISODateTimeFormat.html#dateTime%2D%2D +// ) to obtain a formatter capable of generating timestamps in this format. +// +// +message Timestamp { + // Represents seconds of UTC time since Unix epoch + // 1970-01-01T00:00:00Z. Must be from 0001-01-01T00:00:00Z to + // 9999-12-31T23:59:59Z inclusive. + int64 seconds = 1; + + // Non-negative fractions of a second at nanosecond resolution. Negative + // second values with fractions must still have non-negative nanos values + // that count forward in time. Must be from 0 to 999,999,999 + // inclusive. + int32 nanos = 2; +} diff --git a/vendor/github.com/gogo/protobuf/protobuf/google/protobuf/type.proto b/vendor/github.com/gogo/protobuf/protobuf/google/protobuf/type.proto new file mode 100644 index 0000000000..cc626250de --- /dev/null +++ b/vendor/github.com/gogo/protobuf/protobuf/google/protobuf/type.proto @@ -0,0 +1,187 @@ +// Protocol Buffers - Google's data interchange format +// Copyright 2008 Google Inc. All rights reserved. +// https://developers.google.com/protocol-buffers/ +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// * Redistributions in binary form must reproduce the above +// copyright notice, this list of conditions and the following disclaimer +// in the documentation and/or other materials provided with the +// distribution. +// * Neither the name of Google Inc. nor the names of its +// contributors may be used to endorse or promote products derived from +// this software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +syntax = "proto3"; + +package google.protobuf; + +import "google/protobuf/any.proto"; +import "google/protobuf/source_context.proto"; + +option csharp_namespace = "Google.Protobuf.WellKnownTypes"; +option cc_enable_arenas = true; +option java_package = "com.google.protobuf"; +option java_outer_classname = "TypeProto"; +option java_multiple_files = true; +option objc_class_prefix = "GPB"; +option go_package = "types"; + +// A protocol buffer message type. +message Type { + // The fully qualified message name. + string name = 1; + // The list of fields. + repeated Field fields = 2; + // The list of types appearing in `oneof` definitions in this type. + repeated string oneofs = 3; + // The protocol buffer options. + repeated Option options = 4; + // The source context. + SourceContext source_context = 5; + // The source syntax. + Syntax syntax = 6; +} + +// A single field of a message type. +message Field { + // Basic field types. + enum Kind { + // Field type unknown. + TYPE_UNKNOWN = 0; + // Field type double. + TYPE_DOUBLE = 1; + // Field type float. + TYPE_FLOAT = 2; + // Field type int64. + TYPE_INT64 = 3; + // Field type uint64. + TYPE_UINT64 = 4; + // Field type int32. + TYPE_INT32 = 5; + // Field type fixed64. + TYPE_FIXED64 = 6; + // Field type fixed32. + TYPE_FIXED32 = 7; + // Field type bool. + TYPE_BOOL = 8; + // Field type string. + TYPE_STRING = 9; + // Field type group. Proto2 syntax only, and deprecated. + TYPE_GROUP = 10; + // Field type message. + TYPE_MESSAGE = 11; + // Field type bytes. + TYPE_BYTES = 12; + // Field type uint32. + TYPE_UINT32 = 13; + // Field type enum. + TYPE_ENUM = 14; + // Field type sfixed32. + TYPE_SFIXED32 = 15; + // Field type sfixed64. + TYPE_SFIXED64 = 16; + // Field type sint32. + TYPE_SINT32 = 17; + // Field type sint64. + TYPE_SINT64 = 18; + } + + // Whether a field is optional, required, or repeated. + enum Cardinality { + // For fields with unknown cardinality. + CARDINALITY_UNKNOWN = 0; + // For optional fields. + CARDINALITY_OPTIONAL = 1; + // For required fields. Proto2 syntax only. + CARDINALITY_REQUIRED = 2; + // For repeated fields. + CARDINALITY_REPEATED = 3; + }; + + // The field type. + Kind kind = 1; + // The field cardinality. + Cardinality cardinality = 2; + // The field number. + int32 number = 3; + // The field name. + string name = 4; + // The field type URL, without the scheme, for message or enumeration + // types. Example: `"type.googleapis.com/google.protobuf.Timestamp"`. + string type_url = 6; + // The index of the field type in `Type.oneofs`, for message or enumeration + // types. The first type has index 1; zero means the type is not in the list. + int32 oneof_index = 7; + // Whether to use alternative packed wire representation. + bool packed = 8; + // The protocol buffer options. + repeated Option options = 9; + // The field JSON name. + string json_name = 10; + // The string value of the default value of this field. Proto2 syntax only. + string default_value = 11; +} + +// Enum type definition. +message Enum { + // Enum type name. + string name = 1; + // Enum value definitions. + repeated EnumValue enumvalue = 2; + // Protocol buffer options. + repeated Option options = 3; + // The source context. + SourceContext source_context = 4; + // The source syntax. + Syntax syntax = 5; +} + +// Enum value definition. +message EnumValue { + // Enum value name. + string name = 1; + // Enum value number. + int32 number = 2; + // Protocol buffer options. + repeated Option options = 3; +} + +// A protocol buffer option, which can be attached to a message, field, +// enumeration, etc. +message Option { + // The option's name. For protobuf built-in options (options defined in + // descriptor.proto), this is the short name. For example, `"map_entry"`. + // For custom options, it should be the fully-qualified name. For example, + // `"google.api.http"`. + string name = 1; + // The option's value packed in an Any message. If the value is a primitive, + // the corresponding wrapper type defined in google/protobuf/wrappers.proto + // should be used. If the value is an enum, it should be stored as an int32 + // value using the google.protobuf.Int32Value type. + Any value = 2; +} + +// The syntax in which a protocol buffer element is defined. +enum Syntax { + // Syntax `proto2`. + SYNTAX_PROTO2 = 0; + // Syntax `proto3`. + SYNTAX_PROTO3 = 1; +} diff --git a/vendor/github.com/gogo/protobuf/protobuf/google/protobuf/wrappers.proto b/vendor/github.com/gogo/protobuf/protobuf/google/protobuf/wrappers.proto new file mode 100644 index 0000000000..59b76acde8 --- /dev/null +++ b/vendor/github.com/gogo/protobuf/protobuf/google/protobuf/wrappers.proto @@ -0,0 +1,123 @@ +// Protocol Buffers - Google's data interchange format +// Copyright 2008 Google Inc. All rights reserved. +// https://developers.google.com/protocol-buffers/ +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// * Redistributions in binary form must reproduce the above +// copyright notice, this list of conditions and the following disclaimer +// in the documentation and/or other materials provided with the +// distribution. +// * Neither the name of Google Inc. nor the names of its +// contributors may be used to endorse or promote products derived from +// this software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +// Wrappers for primitive (non-message) types. These types are useful +// for embedding primitives in the `google.protobuf.Any` type and for places +// where we need to distinguish between the absence of a primitive +// typed field and its default value. +// +// These wrappers have no meaningful use within repeated fields as they lack +// the ability to detect presence on individual elements. +// These wrappers have no meaningful use within a map or a oneof since +// individual entries of a map or fields of a oneof can already detect presence. + +syntax = "proto3"; + +package google.protobuf; + +option csharp_namespace = "Google.Protobuf.WellKnownTypes"; +option cc_enable_arenas = true; +option go_package = "types"; +option java_package = "com.google.protobuf"; +option java_outer_classname = "WrappersProto"; +option java_multiple_files = true; +option objc_class_prefix = "GPB"; + +// Wrapper message for `double`. +// +// The JSON representation for `DoubleValue` is JSON number. +message DoubleValue { + // The double value. + double value = 1; +} + +// Wrapper message for `float`. +// +// The JSON representation for `FloatValue` is JSON number. +message FloatValue { + // The float value. + float value = 1; +} + +// Wrapper message for `int64`. +// +// The JSON representation for `Int64Value` is JSON string. +message Int64Value { + // The int64 value. + int64 value = 1; +} + +// Wrapper message for `uint64`. +// +// The JSON representation for `UInt64Value` is JSON string. +message UInt64Value { + // The uint64 value. + uint64 value = 1; +} + +// Wrapper message for `int32`. +// +// The JSON representation for `Int32Value` is JSON number. +message Int32Value { + // The int32 value. + int32 value = 1; +} + +// Wrapper message for `uint32`. +// +// The JSON representation for `UInt32Value` is JSON number. +message UInt32Value { + // The uint32 value. + uint32 value = 1; +} + +// Wrapper message for `bool`. +// +// The JSON representation for `BoolValue` is JSON `true` and `false`. +message BoolValue { + // The bool value. + bool value = 1; +} + +// Wrapper message for `string`. +// +// The JSON representation for `StringValue` is JSON string. +message StringValue { + // The string value. + string value = 1; +} + +// Wrapper message for `bytes`. +// +// The JSON representation for `BytesValue` is JSON string. +message BytesValue { + // The bytes value. + bytes value = 1; +} diff --git a/vendor/modules.txt b/vendor/modules.txt index ebaa45d472..7066c96228 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -61,9 +61,6 @@ github.com/cncf/xds/go/xds/core/v3 # github.com/container-storage-interface/spec v1.2.0 ## explicit github.com/container-storage-interface/spec/lib/go/csi -# github.com/containerd/containerd v1.5.9 -## explicit; go 1.16 -github.com/containerd/containerd/errdefs # github.com/coreos/go-semver v0.3.0 ## explicit github.com/coreos/go-semver/semver @@ -80,8 +77,7 @@ github.com/davecgh/go-spew/spew ## explicit github.com/docker/distribution/digestset github.com/docker/distribution/reference -github.com/docker/distribution/registry/api/errcode -# github.com/docker/docker v20.10.3-0.20220126110425-3c06ebd87668+incompatible +# github.com/docker/docker v20.10.3-0.20220408103430-7ea283fd9166+incompatible ## explicit github.com/docker/docker/api github.com/docker/docker/api/types @@ -291,8 +287,8 @@ github.com/google/trillian/merkle/hashers github.com/google/trillian/merkle/logverifier github.com/google/trillian/merkle/rfc6962 github.com/google/trillian/types -# github.com/gorilla/mux v1.8.0 -## explicit; go 1.12 +# github.com/google/uuid v1.2.0 +## explicit # github.com/gorilla/websocket v1.4.2 ## explicit; go 1.12 github.com/gorilla/websocket diff --git a/version/version.go b/version/version.go index 6b6cdecdf3..21fe4f03e6 100644 --- a/version/version.go +++ b/version/version.go @@ -2,7 +2,7 @@ package version // Package is the overall, canonical project import path under which the // package was built. -var Package = "github.com/docker/swarmkit" +var Package = "github.com/moby/swarmkit/v2" // Version indicates which version of the binary is running. This is set to // the latest release tag by hand, always suffixed by "+unknown". During diff --git a/watch/watch.go b/watch/watch.go index ed5b834452..4ad5f35d27 100644 --- a/watch/watch.go +++ b/watch/watch.go @@ -7,7 +7,7 @@ import ( "time" "github.com/docker/go-events" - "github.com/docker/swarmkit/watch/queue" + "github.com/moby/swarmkit/v2/watch/queue" ) // ChannelSinkGenerator is a constructor of sinks that eventually lead to a From 495ba4414db0ca939356fbd3afc029dbf0334a9a Mon Sep 17 00:00:00 2001 From: CrazyMax Date: Fri, 8 Apr 2022 21:57:19 +0200 Subject: [PATCH 2/7] ci: update circleci config to handle go mod Signed-off-by: CrazyMax --- .circleci/config.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 9bee9a0e04..046bb220d4 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -12,7 +12,7 @@ jobs: OS: linux ARCH: amd64 GOVERSION: 1.17 - GO111MODULE: "off" + GO111MODULE: "on" # Needed to install protoc PROTOC_VERSION: 3.6.1 @@ -77,7 +77,6 @@ jobs: environment: # ensure GOPATH is set to single directory so the make target doesn't need to handle a column-separated list GOPATH: /home/circleci/.go_workspace - GO111MODULE: "on" command: | git fetch origin if test -n "`git diff --stat=1000 origin/master | grep -E \"^[[:space:]]*vendor\"`"; then From a60ac5fee6d6e7eba2d23a154a242afa0523fff1 Mon Sep 17 00:00:00 2001 From: Drew Erny Date: Fri, 15 Apr 2022 11:56:16 -0600 Subject: [PATCH 3/7] Fix incorrect import path in generated protos Signed-off-by: Drew Erny --- Protobuild.toml | 1 + api/api.pb.txt | 20 ++++++++++---------- api/ca.pb.go | 2 +- api/control.pb.go | 2 +- api/dispatcher.pb.go | 2 +- api/health.pb.go | 2 +- api/logbroker.pb.go | 2 +- api/objects.pb.go | 2 +- api/resource.pb.go | 2 +- api/watch.pb.go | 2 +- 10 files changed, 19 insertions(+), 18 deletions(-) diff --git a/Protobuild.toml b/Protobuild.toml index c3f2c3dd54..afbb7dc669 100644 --- a/Protobuild.toml +++ b/Protobuild.toml @@ -31,6 +31,7 @@ plugins = ["grpc", "deepcopy", "storeobject", "raftproxy", "authenticatedwrapper "google/protobuf/timestamp.proto" = "github.com/gogo/protobuf/types" "google/protobuf/duration.proto" = "github.com/gogo/protobuf/types" "google/protobuf/wrappers.proto" = "github.com/gogo/protobuf/types" + "github.com/docker/swarmkit/protobuf/plugin/plugin.proto" = "github.com/moby/swarmkit/v2/protobuf/plugin" [[descriptors]] prefix = "github.com/docker/swarmkit/api" diff --git a/api/api.pb.txt b/api/api.pb.txt index 905338f864..e2ddb07d14 100755 --- a/api/api.pb.txt +++ b/api/api.pb.txt @@ -2735,8 +2735,8 @@ file { label: LABEL_OPTIONAL type: TYPE_UINT32 options { - 65003: "os.FileMode" 65001: 0 + 65003: "os.FileMode" } json_name: "mode" } @@ -2904,8 +2904,8 @@ file { type: TYPE_MESSAGE type_name: ".google.protobuf.Duration" options { - 65011: 1 65001: 0 + 65011: 1 } json_name: "delay" } @@ -3348,8 +3348,8 @@ file { } } options { - 62023: "PublishMode" 62001: 0 + 62023: "PublishMode" } } } @@ -4055,8 +4055,8 @@ file { label: LABEL_OPTIONAL type: TYPE_UINT32 options { - 65003: "os.FileMode" 65001: 0 + 65003: "os.FileMode" } json_name: "mode" } @@ -5052,8 +5052,8 @@ file { } } options { - 62023: "NodeRole" 62001: 0 + 62023: "NodeRole" } } syntax: "proto3" @@ -9739,8 +9739,8 @@ file { type: TYPE_MESSAGE type_name: ".google.protobuf.Duration" options { - 65011: 1 65001: 0 + 65011: 1 } json_name: "period" } @@ -10958,14 +10958,14 @@ file { } } options { - 63017: 1 - 63020: 1 - 63018: 1 63001: 0 63002: 0 - 63035: 0 + 63017: 1 + 63018: 1 + 63020: 1 63026: 0 63034: 0 + 63035: 0 } } file { diff --git a/api/ca.pb.go b/api/ca.pb.go index ab91ef725f..42e77d893d 100644 --- a/api/ca.pb.go +++ b/api/ca.pb.go @@ -6,11 +6,11 @@ package api import ( context "context" fmt "fmt" - _ "github.com/docker/swarmkit/protobuf/plugin" _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" github_com_moby_swarmkit_v2_api_deepcopy "github.com/moby/swarmkit/v2/api/deepcopy" raftselector "github.com/moby/swarmkit/v2/manager/raftselector" + _ "github.com/moby/swarmkit/v2/protobuf/plugin" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" metadata "google.golang.org/grpc/metadata" diff --git a/api/control.pb.go b/api/control.pb.go index 4e13d6fb96..a040b9c1fc 100644 --- a/api/control.pb.go +++ b/api/control.pb.go @@ -6,13 +6,13 @@ package api import ( context "context" fmt "fmt" - _ "github.com/docker/swarmkit/protobuf/plugin" _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" github_com_gogo_protobuf_sortkeys "github.com/gogo/protobuf/sortkeys" types "github.com/gogo/protobuf/types" github_com_moby_swarmkit_v2_api_deepcopy "github.com/moby/swarmkit/v2/api/deepcopy" raftselector "github.com/moby/swarmkit/v2/manager/raftselector" + _ "github.com/moby/swarmkit/v2/protobuf/plugin" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" metadata "google.golang.org/grpc/metadata" diff --git a/api/dispatcher.pb.go b/api/dispatcher.pb.go index 4db6887da6..00542edd9d 100644 --- a/api/dispatcher.pb.go +++ b/api/dispatcher.pb.go @@ -6,13 +6,13 @@ package api import ( context "context" fmt "fmt" - _ "github.com/docker/swarmkit/protobuf/plugin" _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" _ "github.com/gogo/protobuf/types" github_com_gogo_protobuf_types "github.com/gogo/protobuf/types" github_com_moby_swarmkit_v2_api_deepcopy "github.com/moby/swarmkit/v2/api/deepcopy" raftselector "github.com/moby/swarmkit/v2/manager/raftselector" + _ "github.com/moby/swarmkit/v2/protobuf/plugin" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" metadata "google.golang.org/grpc/metadata" diff --git a/api/health.pb.go b/api/health.pb.go index 54c9c77a29..b5795d4da0 100644 --- a/api/health.pb.go +++ b/api/health.pb.go @@ -6,10 +6,10 @@ package api import ( context "context" fmt "fmt" - _ "github.com/docker/swarmkit/protobuf/plugin" _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" raftselector "github.com/moby/swarmkit/v2/manager/raftselector" + _ "github.com/moby/swarmkit/v2/protobuf/plugin" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" metadata "google.golang.org/grpc/metadata" diff --git a/api/logbroker.pb.go b/api/logbroker.pb.go index f7ce7be902..05cacafd78 100644 --- a/api/logbroker.pb.go +++ b/api/logbroker.pb.go @@ -6,12 +6,12 @@ package api import ( context "context" fmt "fmt" - _ "github.com/docker/swarmkit/protobuf/plugin" _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" types "github.com/gogo/protobuf/types" github_com_moby_swarmkit_v2_api_deepcopy "github.com/moby/swarmkit/v2/api/deepcopy" raftselector "github.com/moby/swarmkit/v2/manager/raftselector" + _ "github.com/moby/swarmkit/v2/protobuf/plugin" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" metadata "google.golang.org/grpc/metadata" diff --git a/api/objects.pb.go b/api/objects.pb.go index 8d0115286a..cbd14db42f 100644 --- a/api/objects.pb.go +++ b/api/objects.pb.go @@ -6,12 +6,12 @@ package api import ( fmt "fmt" github_com_docker_go_events "github.com/docker/go-events" - _ "github.com/docker/swarmkit/protobuf/plugin" _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" github_com_gogo_protobuf_sortkeys "github.com/gogo/protobuf/sortkeys" types "github.com/gogo/protobuf/types" github_com_moby_swarmkit_v2_api_deepcopy "github.com/moby/swarmkit/v2/api/deepcopy" + _ "github.com/moby/swarmkit/v2/protobuf/plugin" io "io" math "math" math_bits "math/bits" diff --git a/api/resource.pb.go b/api/resource.pb.go index 324104084b..3466e44073 100644 --- a/api/resource.pb.go +++ b/api/resource.pb.go @@ -6,11 +6,11 @@ package api import ( context "context" fmt "fmt" - _ "github.com/docker/swarmkit/protobuf/plugin" _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" github_com_moby_swarmkit_v2_api_deepcopy "github.com/moby/swarmkit/v2/api/deepcopy" raftselector "github.com/moby/swarmkit/v2/manager/raftselector" + _ "github.com/moby/swarmkit/v2/protobuf/plugin" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" metadata "google.golang.org/grpc/metadata" diff --git a/api/watch.pb.go b/api/watch.pb.go index c54e27d680..9203d58db1 100644 --- a/api/watch.pb.go +++ b/api/watch.pb.go @@ -6,11 +6,11 @@ package api import ( context "context" fmt "fmt" - _ "github.com/docker/swarmkit/protobuf/plugin" _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" github_com_moby_swarmkit_v2_api_deepcopy "github.com/moby/swarmkit/v2/api/deepcopy" raftselector "github.com/moby/swarmkit/v2/manager/raftselector" + _ "github.com/moby/swarmkit/v2/protobuf/plugin" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" metadata "google.golang.org/grpc/metadata" From 7aadafa49679ddc1c3b5e5b259ac86c152b4a95f Mon Sep 17 00:00:00 2001 From: Cory Snider Date: Mon, 18 Apr 2022 12:29:41 -0400 Subject: [PATCH 4/7] Fix test coverage Resolve package import paths to the corresponding source paths in the Makefile. Signed-off-by: Cory Snider --- direct.mk | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/direct.mk b/direct.mk index b6d25cf34d..4efea58bbd 100644 --- a/direct.mk +++ b/direct.mk @@ -8,8 +8,8 @@ VERSION=$(shell git describe --match 'v[0-9]*' --dirty='.m' --always) RACE := $(shell test $$(go env GOARCH) != "amd64" || (echo "-race")) # Project packages. -PACKAGES := $(shell go list ./...) -INTEGRATION_PACKAGE := $(shell go list ./integration) +PACKAGES = $(shell go list ./...) +INTEGRATION_PACKAGE = $(shell go list ./integration) # Project binaries. COMMANDS=swarmd swarmctl swarm-bench swarm-rafttool protoc-gen-gogoswarm @@ -119,14 +119,14 @@ uninstall: coverage: ## generate coverprofiles from the unit tests @echo "🐳 $@" @( for pkg in $(filter-out ${INTEGRATION_PACKAGE},${PACKAGES}); do \ - go test ${RACE} -tags "${DOCKER_BUILDTAGS}" -test.short -coverprofile="../../../$$pkg/coverage.txt" -covermode=atomic $$pkg || exit; \ - go test ${RACE} -tags "${DOCKER_BUILDTAGS}" -test.short -coverprofile="../../../$$pkg/coverage.txt" -covermode=atomic $$pkg || exit; \ + go test ${RACE} -tags "${DOCKER_BUILDTAGS}" -test.short -coverprofile="$$(go list -f "{{.Dir}}" $$pkg)/coverage.txt" -covermode=atomic $$pkg || exit; \ + go test ${RACE} -tags "${DOCKER_BUILDTAGS}" -test.short -coverprofile="$$(go list -f "{{.Dir}}" $$pkg)/coverage.txt" -covermode=atomic $$pkg || exit; \ done ) .PHONY: coverage-integration coverage-integration: ## generate coverprofiles from the integration tests @echo "🐳 $@" - go test ${RACE} -tags "${DOCKER_BUILDTAGS}" -test.short -coverprofile="../../../${INTEGRATION_PACKAGE}/coverage.txt" -covermode=atomic ${INTEGRATION_PACKAGE} + go test ${RACE} -tags "${DOCKER_BUILDTAGS}" -test.short -coverprofile="$$(go list -f "{{.Dir}}" ${INTEGRATION_PACKAGE})/coverage.txt" -covermode=atomic ${INTEGRATION_PACKAGE} .PHONY: help help: ## this help From b1aac88ed7cd28b6a12c12ad4c2a9cc1d423d3bb Mon Sep 17 00:00:00 2001 From: Drew Erny Date: Mon, 18 Apr 2022 11:23:50 -0600 Subject: [PATCH 5/7] Update GOVERSION in CI config Signed-off-by: Drew Erny --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 046bb220d4..a6120dc811 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -11,7 +11,7 @@ jobs: # Needed to install go OS: linux ARCH: amd64 - GOVERSION: 1.17 + GOVERSION: 1.17.9 GO111MODULE: "on" # Needed to install protoc PROTOC_VERSION: 3.6.1 From eccc3613e424446e8b4533ab2c17216ac07ecb7d Mon Sep 17 00:00:00 2001 From: Cory Snider Date: Mon, 18 Apr 2022 16:54:42 -0400 Subject: [PATCH 6/7] Fix data race in memory store I don't know how, but something about converting to a Go module and renaming it has shaken out a latent data race. The memory store implementation had made the assumption that the callback function supplied to ProposeValue() is invoked iff ProposeValue() returns err == nil. This is not strictly true: in certain rare circumstances, ProposeValue() can return a non-nil error while the callback is being executed asynchronously in another goroutine. This results in a data race, concurrently Commit()ing and Abort()ing the same memDB transaction. Fix the data race by adding a guard to prevent Abort() from being called if Commit() has been, and vice versa. Signed-off-by: Cory Snider --- manager/state/store/memory.go | 44 ++++++++++++++++++++++++++++++----- 1 file changed, 38 insertions(+), 6 deletions(-) diff --git a/manager/state/store/memory.go b/manager/state/store/memory.go index 1d81e3b430..e1b63508d2 100644 --- a/manager/state/store/memory.go +++ b/manager/state/store/memory.go @@ -13,12 +13,12 @@ import ( "github.com/docker/go-events" "github.com/docker/go-metrics" + gogotypes "github.com/gogo/protobuf/types" + memdb "github.com/hashicorp/go-memdb" "github.com/moby/swarmkit/v2/api" pb "github.com/moby/swarmkit/v2/api" "github.com/moby/swarmkit/v2/manager/state" "github.com/moby/swarmkit/v2/watch" - gogotypes "github.com/gogo/protobuf/types" - memdb "github.com/hashicorp/go-memdb" ) const ( @@ -335,6 +335,9 @@ func (s *MemoryStore) update(proposer state.Proposer, cb func(Tx) error) error { err := cb(&tx) + commitGuard := make(chan struct{}, 1) + commitGuard <- struct{}{} + if err == nil { if proposer == nil { memDBTx.Commit() @@ -345,7 +348,12 @@ func (s *MemoryStore) update(proposer state.Proposer, cb func(Tx) error) error { if err == nil { if len(sa) != 0 { err = proposer.ProposeValue(context.Background(), sa, func() { - memDBTx.Commit() + select { + case <-commitGuard: + memDBTx.Commit() + default: + // Already Abort()ed. + } }) } else { memDBTx.Commit() @@ -366,7 +374,15 @@ func (s *MemoryStore) update(proposer state.Proposer, cb func(Tx) error) error { s.queue.Publish(state.EventCommit{Version: curVersion}) } } else { - memDBTx.Abort() + // The ProposeValue callback could still have executed, or be + // executed in the near future. Guard against racing the + // Commit(). + select { + case <-commitGuard: + memDBTx.Abort() + default: + // Already Abort()ed. + } } s.updateLock.Unlock() return err @@ -448,6 +464,9 @@ func (batch *Batch) newTx() { } func (batch *Batch) commit() error { + guard := make(chan struct{}, 1) + guard <- struct{}{} + if batch.store.proposer != nil { var sa []api.StoreAction sa, batch.err = batch.tx.changelistStoreActions() @@ -455,7 +474,12 @@ func (batch *Batch) commit() error { if batch.err == nil { if len(sa) != 0 { batch.err = batch.store.proposer.ProposeValue(context.Background(), sa, func() { - batch.tx.memDBTx.Commit() + select { + case <-guard: + batch.tx.memDBTx.Commit() + default: + // Already Abort()ed. + } }) } else { batch.tx.memDBTx.Commit() @@ -466,7 +490,15 @@ func (batch *Batch) commit() error { } if batch.err != nil { - batch.tx.memDBTx.Abort() + // The ProposeValue callback could still have executed, or be + // executed in the near future. Guard against racing the + // Commit(). + select { + case <-guard: + batch.tx.memDBTx.Abort() + default: + // Already Commit()ed. + } return batch.err } From 3fb8c6b23e6add2f4adea3639a7da1f9560c2610 Mon Sep 17 00:00:00 2001 From: Cory Snider Date: Tue, 19 Apr 2022 13:27:06 -0400 Subject: [PATCH 7/7] Dump all goroutine stacks if event not received Unit tests are failing on CircleCI but not when run locally. Crank up the verbosity to try to figure out what's happening. Signed-off-by: Cory Snider --- manager/orchestrator/testutils/testutils.go | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/manager/orchestrator/testutils/testutils.go b/manager/orchestrator/testutils/testutils.go index 00973d3526..88c253866f 100644 --- a/manager/orchestrator/testutils/testutils.go +++ b/manager/orchestrator/testutils/testutils.go @@ -2,6 +2,7 @@ package testutils import ( "fmt" + "runtime" "testing" "time" @@ -39,7 +40,7 @@ func WatchTaskCreate(t *testing.T, watch chan events.Event) *api.Task { assert.FailNow(t, "got EventUpdateTask when expecting EventCreateTask", fmt.Sprint(event)) } case <-time.After(3 * time.Second): - assert.FailNow(t, "no task creation") + FatalStack(t, "no task creation") } } } @@ -56,7 +57,7 @@ func WatchTaskUpdate(t *testing.T, watch chan events.Event) *api.Task { assert.FailNow(t, "got EventCreateTask when expecting EventUpdateTask", fmt.Sprint(event)) } case <-time.After(2 * time.Second): - assert.FailNow(t, "no task update") + FatalStack(t, "no task update") } } } @@ -70,7 +71,7 @@ func WatchTaskDelete(t *testing.T, watch chan events.Event) *api.Task { return task.Task } case <-time.After(time.Second): - assert.FailNow(t, "no task deletion") + FatalStack(t, "no task deletion") } } } @@ -88,7 +89,7 @@ func WatchShutdownTask(t *testing.T, watch chan events.Event) *api.Task { assert.FailNow(t, "got EventCreateTask when expecting EventUpdateTask", fmt.Sprint(event)) } case <-time.After(time.Second): - assert.FailNow(t, "no task shutdown") + FatalStack(t, "no task shutdown") } } } @@ -104,7 +105,15 @@ func Expect(t *testing.T, watch chan events.Event, specifiers ...api.Event) { } return case <-time.After(time.Second): - assert.FailNow(t, "no matching event") + FatalStack(t, "no matching event") } } } + +// FatalStack logs the stacks of all goroutines and immediately fails the test. +func FatalStack(t *testing.T, msg string, args ...interface{}) { + stack := make([]byte, 1024*1024) + stack = stack[:runtime.Stack(stack, true)] + t.Logf("%s\n", stack) + assert.FailNow(t, msg, args...) +}