From 1c129103b48f87b951bc2c4281feb7537c13ca41 Mon Sep 17 00:00:00 2001 From: Cory Snider Date: Thu, 21 Apr 2022 17:33:07 -0400 Subject: [PATCH] Bump swarmkit to v2 Signed-off-by: Cory Snider --- cmd/dockerd/daemon.go | 2 +- container/container.go | 2 +- daemon/cluster/cluster.go | 4 +- daemon/cluster/configs.go | 2 +- .../cluster/controllers/plugin/controller.go | 2 +- daemon/cluster/convert/config.go | 2 +- daemon/cluster/convert/container.go | 2 +- daemon/cluster/convert/network.go | 2 +- daemon/cluster/convert/network_test.go | 2 +- daemon/cluster/convert/node.go | 2 +- daemon/cluster/convert/secret.go | 2 +- daemon/cluster/convert/service.go | 4 +- daemon/cluster/convert/service_test.go | 2 +- daemon/cluster/convert/swarm.go | 4 +- daemon/cluster/convert/task.go | 2 +- daemon/cluster/executor/backend.go | 2 +- daemon/cluster/executor/container/adapter.go | 6 +- .../executor/container/adapter_test.go | 2 +- .../cluster/executor/container/attachment.go | 4 +- .../cluster/executor/container/container.go | 8 +- .../executor/container/container_test.go | 2 +- .../cluster/executor/container/controller.go | 6 +- daemon/cluster/executor/container/executor.go | 12 +- .../cluster/executor/container/health_test.go | 2 +- daemon/cluster/executor/container/validate.go | 2 +- .../executor/container/validate_test.go | 2 +- .../container/validate_windows_test.go | 2 +- daemon/cluster/filters.go | 2 +- daemon/cluster/helpers.go | 2 +- daemon/cluster/networks.go | 2 +- daemon/cluster/noderunner.go | 6 +- daemon/cluster/nodes.go | 2 +- daemon/cluster/secrets.go | 2 +- daemon/cluster/services.go | 2 +- daemon/cluster/swarm.go | 6 +- daemon/cluster/tasks.go | 2 +- daemon/config/opts.go | 2 +- daemon/dependency.go | 2 +- daemon/events.go | 2 +- daemon/oci_windows_test.go | 4 +- integration-cli/docker_api_swarm_test.go | 2 +- integration-cli/docker_cli_swarm_test.go | 2 +- vendor.mod | 21 +- vendor.sum | 27 +- vendor/cloud.google.com/go/doc.go | 84 ++- .../github.com/hashicorp/go-memdb/.gitignore | 2 + .../github.com/hashicorp/go-memdb/README.md | 107 +++- .../github.com/hashicorp/go-memdb/changes.go | 34 ++ .../github.com/hashicorp/go-memdb/filter.go | 38 ++ vendor/github.com/hashicorp/go-memdb/index.go | 522 ++++++++++++++++- vendor/github.com/hashicorp/go-memdb/memdb.go | 55 +- .../github.com/hashicorp/go-memdb/schema.go | 55 +- vendor/github.com/hashicorp/go-memdb/txn.go | 534 ++++++++++++++++-- vendor/github.com/hashicorp/go-memdb/watch.go | 144 +++++ .../hashicorp/go-memdb/watch_few.go | 117 ++++ vendor/github.com/ishidawataru/sctp/sctp.go | 8 + .../swarmkit => moby/swarmkit/v2}/LICENSE | 0 .../swarmkit/v2}/agent/agent.go | 6 +- .../swarmkit/v2}/agent/config.go | 6 +- .../swarmkit/v2}/agent/configs/configs.go | 4 +- .../swarmkit/v2}/agent/csi/plugin/manager.go | 2 +- .../swarmkit/v2}/agent/csi/plugin/plugin.go | 4 +- .../swarmkit/v2}/agent/csi/volumes.go | 10 +- .../swarmkit/v2}/agent/dependency.go | 10 +- .../swarmkit/v2}/agent/errors.go | 0 .../swarmkit/v2}/agent/exec/controller.go | 8 +- .../v2}/agent/exec/controller_stub.go | 2 +- .../swarmkit/v2}/agent/exec/errors.go | 0 .../swarmkit/v2}/agent/exec/executor.go | 2 +- .../swarmkit/v2}/agent/helpers.go | 0 .../swarmkit/v2}/agent/reporter.go | 4 +- .../swarmkit/v2}/agent/resource.go | 2 +- .../swarmkit/v2}/agent/secrets/secrets.go | 6 +- .../swarmkit/v2}/agent/session.go | 6 +- .../swarmkit/v2}/agent/storage.go | 2 +- .../swarmkit/v2}/agent/task.go | 8 +- .../swarmkit/v2}/agent/worker.go | 8 +- .../swarmkit/v2}/api/README.md | 0 .../swarmkit/v2}/api/api.pb.txt | 0 .../swarmkit/v2}/api/ca.pb.go | 12 +- .../swarmkit/v2}/api/ca.proto | 0 .../swarmkit/v2}/api/control.pb.go | 140 ++--- .../swarmkit/v2}/api/control.proto | 0 .../swarmkit/v2}/api/deepcopy/copy.go | 0 .../swarmkit/v2}/api/defaults/service.go | 4 +- .../swarmkit/v2}/api/dispatcher.pb.go | 36 +- .../swarmkit/v2}/api/dispatcher.proto | 0 .../swarmkit/v2}/api/equality/equality.go | 2 +- .../v2}/api/genericresource/helpers.go | 2 +- .../swarmkit/v2}/api/genericresource/parse.go | 2 +- .../genericresource/resource_management.go | 2 +- .../v2}/api/genericresource/string.go | 2 +- .../v2}/api/genericresource/validate.go | 2 +- .../swarmkit/v2}/api/health.pb.go | 4 +- .../swarmkit/v2}/api/health.proto | 0 .../swarmkit/v2}/api/logbroker.pb.go | 26 +- .../swarmkit/v2}/api/logbroker.proto | 0 .../swarmkit/v2}/api/naming/naming.go | 2 +- .../swarmkit/v2}/api/objects.pb.go | 120 ++-- .../swarmkit/v2}/api/objects.proto | 0 .../swarmkit/v2}/api/raft.pb.go | 32 +- .../swarmkit/v2}/api/raft.proto | 0 .../swarmkit/v2}/api/resource.pb.go | 8 +- .../swarmkit/v2}/api/resource.proto | 0 .../swarmkit/v2}/api/snapshot.pb.go | 28 +- .../swarmkit/v2}/api/snapshot.proto | 0 .../swarmkit/v2}/api/specs.pb.go | 110 ++-- .../swarmkit/v2}/api/specs.proto | 0 .../swarmkit/v2}/api/storeobject.go | 0 .../swarmkit/v2}/api/types.pb.go | 136 ++--- .../swarmkit/v2}/api/types.proto | 0 .../swarmkit/v2}/api/validation/secrets.go | 0 .../swarmkit/v2}/api/watch.pb.go | 46 +- .../swarmkit/v2}/api/watch.proto | 0 .../swarmkit => moby/swarmkit/v2}/ca/auth.go | 4 +- .../swarmkit/v2}/ca/certificates.go | 8 +- .../swarmkit/v2}/ca/config.go | 10 +- .../swarmkit/v2}/ca/external.go | 2 +- .../swarmkit/v2}/ca/forward.go | 0 .../swarmkit/v2}/ca/keyreadwriter.go | 6 +- .../swarmkit/v2}/ca/keyutils/keyutils.go | 2 +- .../swarmkit/v2}/ca/pkcs8/pkcs8.go | 0 .../swarmkit/v2}/ca/reconciler.go | 8 +- .../swarmkit/v2}/ca/renewer.go | 4 +- .../swarmkit/v2}/ca/server.go | 10 +- .../swarmkit/v2}/ca/transport.go | 0 .../swarmkit/v2}/connectionbroker/broker.go | 4 +- .../swarmkit/v2}/identity/combined_id.go | 0 .../swarmkit/v2}/identity/doc.go | 0 .../swarmkit/v2}/identity/randomid.go | 0 .../swarmkit/v2}/ioutils/ioutils.go | 0 .../swarmkit/v2}/log/context.go | 0 .../swarmkit => moby/swarmkit/v2}/log/grpc.go | 0 .../v2}/manager/allocator/allocator.go | 8 +- .../allocator/cnmallocator/drivers_darwin.go | 2 +- .../allocator/cnmallocator/drivers_ipam.go | 0 .../cnmallocator/drivers_network_linux.go | 2 +- .../cnmallocator/drivers_network_windows.go | 2 +- .../cnmallocator/drivers_unsupported.go | 2 +- .../cnmallocator/networkallocator.go | 6 +- .../allocator/cnmallocator/portallocator.go | 2 +- .../swarmkit/v2}/manager/allocator/doc.go | 0 .../swarmkit/v2}/manager/allocator/network.go | 14 +- .../networkallocator/networkallocator.go | 2 +- .../v2}/manager/constraint/constraint.go | 2 +- .../v2}/manager/controlapi/ca_rotation.go | 6 +- .../v2}/manager/controlapi/cluster.go | 10 +- .../swarmkit/v2}/manager/controlapi/common.go | 6 +- .../swarmkit/v2}/manager/controlapi/config.go | 8 +- .../v2}/manager/controlapi/extension.go | 8 +- .../v2}/manager/controlapi/network.go | 10 +- .../swarmkit/v2}/manager/controlapi/node.go | 6 +- .../v2}/manager/controlapi/resource.go | 8 +- .../swarmkit/v2}/manager/controlapi/secret.go | 10 +- .../swarmkit/v2}/manager/controlapi/server.go | 8 +- .../v2}/manager/controlapi/service.go | 20 +- .../swarmkit/v2}/manager/controlapi/task.go | 8 +- .../swarmkit/v2}/manager/controlapi/volume.go | 6 +- .../swarmkit/v2}/manager/csi/convert.go | 2 +- .../swarmkit/v2}/manager/csi/doc.go | 0 .../swarmkit/v2}/manager/csi/manager.go | 8 +- .../swarmkit/v2}/manager/csi/plugin.go | 2 +- .../swarmkit/v2}/manager/csi/secret.go | 4 +- .../swarmkit/v2}/manager/deks.go | 6 +- .../swarmkit/v2}/manager/dirty.go | 4 +- .../v2}/manager/dispatcher/assignments.go | 12 +- .../v2}/manager/dispatcher/dispatcher.go | 18 +- .../manager/dispatcher/heartbeat/heartbeat.go | 0 .../swarmkit/v2}/manager/dispatcher/nodes.go | 6 +- .../swarmkit/v2}/manager/dispatcher/period.go | 0 .../swarmkit/v2}/manager/doc.go | 0 .../swarmkit/v2}/manager/drivers/provider.go | 2 +- .../swarmkit/v2}/manager/drivers/secrets.go | 4 +- .../v2}/manager/encryption/encryption.go | 2 +- .../swarmkit/v2}/manager/encryption/fernet.go | 2 +- .../swarmkit/v2}/manager/encryption/nacl.go | 2 +- .../swarmkit/v2}/manager/health/health.go | 2 +- .../v2}/manager/keymanager/keymanager.go | 6 +- .../swarmkit/v2}/manager/logbroker/broker.go | 12 +- .../v2}/manager/logbroker/subscription.go | 10 +- .../swarmkit/v2}/manager/manager.go | 60 +- .../swarmkit/v2}/manager/metrics/collector.go | 4 +- .../constraintenforcer/constraint_enforcer.go | 14 +- .../v2}/manager/orchestrator/global/global.go | 16 +- .../orchestrator/jobs/global/reconciler.go | 8 +- .../manager/orchestrator/jobs/orchestrator.go | 16 +- .../jobs/replicated/reconciler.go | 6 +- .../orchestrator/replicated/replicated.go | 10 +- .../orchestrator/replicated/services.go | 8 +- .../manager/orchestrator/replicated/slot.go | 6 +- .../manager/orchestrator/replicated/tasks.go | 10 +- .../manager/orchestrator/restart/restart.go | 12 +- .../v2}/manager/orchestrator/service.go | 6 +- .../swarmkit/v2}/manager/orchestrator/slot.go | 2 +- .../swarmkit/v2}/manager/orchestrator/task.go | 10 +- .../v2}/manager/orchestrator/taskinit/init.go | 12 +- .../orchestrator/taskreaper/task_reaper.go | 10 +- .../manager/orchestrator/update/updater.go | 18 +- .../volumeenforcer/volume_enforcer.go | 6 +- .../v2}/manager/raftselector/raftselector.go | 0 .../v2}/manager/resourceapi/allocator.go | 10 +- .../swarmkit/v2}/manager/role_manager.go | 10 +- .../v2}/manager/scheduler/decision_tree.go | 0 .../swarmkit/v2}/manager/scheduler/filter.go | 6 +- .../v2}/manager/scheduler/nodeheap.go | 0 .../v2}/manager/scheduler/nodeinfo.go | 6 +- .../swarmkit/v2}/manager/scheduler/nodeset.go | 4 +- .../v2}/manager/scheduler/pipeline.go | 2 +- .../v2}/manager/scheduler/scheduler.go | 12 +- .../v2}/manager/scheduler/topology.go | 2 +- .../swarmkit/v2}/manager/scheduler/volumes.go | 4 +- .../swarmkit/v2}/manager/state/proposer.go | 2 +- .../manager/state/raft/membership/cluster.go | 4 +- .../swarmkit/v2}/manager/state/raft/raft.go | 20 +- .../v2}/manager/state/raft/storage.go | 12 +- .../manager/state/raft/storage/snapwrap.go | 2 +- .../v2}/manager/state/raft/storage/storage.go | 4 +- .../v2}/manager/state/raft/storage/walwrap.go | 4 +- .../v2}/manager/state/raft/transport/peer.go | 6 +- .../manager/state/raft/transport/transport.go | 2 +- .../swarmkit/v2}/manager/state/raft/util.go | 6 +- .../swarmkit/v2}/manager/state/raft/wait.go | 0 .../swarmkit/v2}/manager/state/store/apply.go | 4 +- .../swarmkit/v2}/manager/state/store/by.go | 2 +- .../v2}/manager/state/store/clusters.go | 2 +- .../v2}/manager/state/store/combinators.go | 0 .../v2}/manager/state/store/configs.go | 2 +- .../swarmkit/v2}/manager/state/store/doc.go | 0 .../v2}/manager/state/store/extensions.go | 2 +- .../v2}/manager/state/store/memory.go | 48 +- .../v2}/manager/state/store/networks.go | 2 +- .../swarmkit/v2}/manager/state/store/nodes.go | 2 +- .../v2}/manager/state/store/object.go | 2 +- .../v2}/manager/state/store/resources.go | 2 +- .../v2}/manager/state/store/secrets.go | 2 +- .../v2}/manager/state/store/services.go | 4 +- .../swarmkit/v2}/manager/state/store/tasks.go | 4 +- .../v2}/manager/state/store/volumes.go | 2 +- .../swarmkit/v2}/manager/state/watch.go | 4 +- .../swarmkit/v2}/manager/watchapi/server.go | 2 +- .../swarmkit/v2}/manager/watchapi/watch.go | 6 +- .../swarmkit/v2}/node/node.go | 28 +- .../swarmkit/v2}/protobuf/plugin/helpers.go | 0 .../swarmkit/v2}/protobuf/plugin/plugin.pb.go | 4 +- .../swarmkit/v2}/protobuf/plugin/plugin.proto | 0 .../swarmkit/v2}/protobuf/ptypes/doc.go | 0 .../swarmkit/v2}/protobuf/ptypes/timestamp.go | 0 .../swarmkit/v2}/remotes/remotes.go | 2 +- .../swarmkit/v2}/template/context.go | 10 +- .../swarmkit/v2}/template/expand.go | 4 +- .../swarmkit/v2}/template/getter.go | 4 +- .../swarmkit/v2}/template/template.go | 0 .../swarmkit/v2}/volumequeue/doc.go | 0 .../swarmkit/v2}/volumequeue/queue.go | 0 .../swarmkit/v2}/watch/queue/queue.go | 0 .../swarmkit/v2}/watch/sinks.go | 0 .../swarmkit/v2}/watch/watch.go | 2 +- .../swarmkit/v2}/xnet/xnet_unix.go | 0 .../swarmkit/v2}/xnet/xnet_windows.go | 0 .../image-spec/specs-go/v1/descriptor.go | 5 + .../image-spec/specs-go/v1/index.go | 2 +- .../image-spec/specs-go/v1/manifest.go | 2 +- vendor/modules.txt | 155 +++-- 263 files changed, 2583 insertions(+), 1077 deletions(-) create mode 100644 vendor/github.com/hashicorp/go-memdb/changes.go create mode 100644 vendor/github.com/hashicorp/go-memdb/filter.go create mode 100644 vendor/github.com/hashicorp/go-memdb/watch.go create mode 100644 vendor/github.com/hashicorp/go-memdb/watch_few.go rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/LICENSE (100%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/agent/agent.go (99%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/agent/config.go (94%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/agent/configs/configs.go (96%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/agent/csi/plugin/manager.go (98%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/agent/csi/plugin/plugin.go (99%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/agent/csi/volumes.go (96%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/agent/dependency.go (88%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/agent/errors.go (100%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/agent/exec/controller.go (98%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/agent/exec/controller_stub.go (98%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/agent/exec/errors.go (100%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/agent/exec/executor.go (99%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/agent/helpers.go (100%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/agent/reporter.go (98%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/agent/resource.go (98%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/agent/secrets/secrets.go (96%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/agent/session.go (99%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/agent/storage.go (99%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/agent/task.go (97%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/agent/worker.go (99%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/api/README.md (100%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/api/api.pb.txt (100%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/api/ca.pb.go (99%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/api/ca.proto (100%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/api/control.pb.go (99%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/api/control.proto (100%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/api/deepcopy/copy.go (100%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/api/defaults/service.go (97%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/api/dispatcher.pb.go (99%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/api/dispatcher.proto (100%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/api/equality/equality.go (98%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/api/genericresource/helpers.go (98%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/api/genericresource/parse.go (98%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/api/genericresource/resource_management.go (99%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/api/genericresource/string.go (97%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/api/genericresource/validate.go (98%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/api/health.pb.go (99%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/api/health.proto (100%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/api/logbroker.pb.go (99%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/api/logbroker.proto (100%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/api/naming/naming.go (97%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/api/objects.pb.go (98%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/api/objects.proto (100%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/api/raft.pb.go (98%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/api/raft.proto (100%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/api/resource.pb.go (99%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/api/resource.proto (100%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/api/snapshot.pb.go (97%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/api/snapshot.proto (100%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/api/specs.pb.go (98%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/api/specs.proto (100%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/api/storeobject.go (100%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/api/types.pb.go (99%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/api/types.proto (100%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/api/validation/secrets.go (100%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/api/watch.pb.go (98%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/api/watch.proto (100%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/ca/auth.go (99%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/ca/certificates.go (99%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/ca/config.go (99%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/ca/external.go (99%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/ca/forward.go (100%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/ca/keyreadwriter.go (99%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/ca/keyutils/keyutils.go (98%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/ca/pkcs8/pkcs8.go (100%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/ca/reconciler.go (98%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/ca/renewer.go (98%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/ca/server.go (99%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/ca/transport.go (100%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/connectionbroker/broker.go (97%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/identity/combined_id.go (100%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/identity/doc.go (100%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/identity/randomid.go (100%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/ioutils/ioutils.go (100%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/log/context.go (100%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/log/grpc.go (100%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/manager/allocator/allocator.go (96%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/manager/allocator/cnmallocator/drivers_darwin.go (85%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/manager/allocator/cnmallocator/drivers_ipam.go (100%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/manager/allocator/cnmallocator/drivers_network_linux.go (92%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/manager/allocator/cnmallocator/drivers_network_windows.go (85%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/manager/allocator/cnmallocator/drivers_unsupported.go (81%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/manager/allocator/cnmallocator/networkallocator.go (99%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/manager/allocator/cnmallocator/portallocator.go (99%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/manager/allocator/doc.go (100%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/manager/allocator/network.go (99%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/manager/allocator/networkallocator/networkallocator.go (99%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/manager/constraint/constraint.go (99%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/manager/controlapi/ca_rotation.go (99%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/manager/controlapi/cluster.go (98%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/manager/controlapi/common.go (96%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/manager/controlapi/config.go (98%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/manager/controlapi/extension.go (96%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/manager/controlapi/network.go (97%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/manager/controlapi/node.go (98%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/manager/controlapi/resource.go (98%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/manager/controlapi/secret.go (97%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/manager/controlapi/server.go (80%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/manager/controlapi/service.go (98%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/manager/controlapi/task.go (96%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/manager/controlapi/volume.go (98%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/manager/csi/convert.go (99%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/manager/csi/doc.go (100%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/manager/csi/manager.go (98%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/manager/csi/plugin.go (99%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/manager/csi/secret.go (89%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/manager/deks.go (98%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/manager/dirty.go (95%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/manager/dispatcher/assignments.go (98%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/manager/dispatcher/dispatcher.go (99%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/manager/dispatcher/heartbeat/heartbeat.go (100%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/manager/dispatcher/nodes.go (97%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/manager/dispatcher/period.go (100%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/manager/doc.go (100%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/manager/drivers/provider.go (96%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/manager/drivers/secrets.go (98%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/manager/encryption/encryption.go (99%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/manager/encryption/fernet.go (97%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/manager/encryption/nacl.go (98%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/manager/health/health.go (98%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/manager/keymanager/keymanager.go (98%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/manager/logbroker/broker.go (97%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/manager/logbroker/subscription.go (96%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/manager/manager.go (96%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/manager/metrics/collector.go (98%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/manager/orchestrator/constraintenforcer/constraint_enforcer.go (95%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/manager/orchestrator/global/global.go (97%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/manager/orchestrator/jobs/global/reconciler.go (98%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/manager/orchestrator/jobs/orchestrator.go (95%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/manager/orchestrator/jobs/replicated/reconciler.go (98%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/manager/orchestrator/replicated/replicated.go (90%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/manager/orchestrator/replicated/services.go (98%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/manager/orchestrator/replicated/slot.go (95%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/manager/orchestrator/replicated/tasks.go (95%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/manager/orchestrator/restart/restart.go (98%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/manager/orchestrator/service.go (96%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/manager/orchestrator/slot.go (95%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/manager/orchestrator/task.go (96%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/manager/orchestrator/taskinit/init.go (94%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/manager/orchestrator/taskreaper/task_reaper.go (98%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/manager/orchestrator/update/updater.go (97%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/manager/orchestrator/volumeenforcer/volume_enforcer.go (96%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/manager/raftselector/raftselector.go (100%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/manager/resourceapi/allocator.go (94%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/manager/role_manager.go (97%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/manager/scheduler/decision_tree.go (100%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/manager/scheduler/filter.go (98%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/manager/scheduler/nodeheap.go (100%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/manager/scheduler/nodeinfo.go (98%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/manager/scheduler/nodeset.go (97%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/manager/scheduler/pipeline.go (98%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/manager/scheduler/scheduler.go (99%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/manager/scheduler/topology.go (98%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/manager/scheduler/volumes.go (99%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/manager/state/proposer.go (96%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/manager/state/raft/membership/cluster.go (98%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/manager/state/raft/raft.go (99%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/manager/state/raft/storage.go (96%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/manager/state/raft/storage/snapwrap.go (98%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/manager/state/raft/storage/storage.go (99%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/manager/state/raft/storage/walwrap.go (98%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/manager/state/raft/transport/peer.go (98%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/manager/state/raft/transport/transport.go (99%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/manager/state/raft/util.go (94%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/manager/state/raft/wait.go (100%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/manager/state/store/apply.go (93%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/manager/state/store/by.go (99%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/manager/state/store/clusters.go (98%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/manager/state/store/combinators.go (100%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/manager/state/store/configs.go (98%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/manager/state/store/doc.go (100%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/manager/state/store/extensions.go (99%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/manager/state/store/memory.go (96%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/manager/state/store/networks.go (98%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/manager/state/store/nodes.go (99%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/manager/state/store/object.go (97%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/manager/state/store/resources.go (99%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/manager/state/store/secrets.go (98%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/manager/state/store/services.go (98%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/manager/state/store/tasks.go (99%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/manager/state/store/volumes.go (99%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/manager/state/watch.go (97%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/manager/watchapi/server.go (94%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/manager/watchapi/watch.go (92%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/node/node.go (98%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/protobuf/plugin/helpers.go (100%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/protobuf/plugin/plugin.pb.go (99%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/protobuf/plugin/plugin.proto (100%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/protobuf/ptypes/doc.go (100%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/protobuf/ptypes/timestamp.go (100%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/remotes/remotes.go (99%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/template/context.go (96%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/template/expand.go (98%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/template/getter.go (98%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/template/template.go (100%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/volumequeue/doc.go (100%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/volumequeue/queue.go (100%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/watch/queue/queue.go (100%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/watch/sinks.go (100%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/watch/watch.go (99%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/xnet/xnet_unix.go (100%) rename vendor/github.com/{docker/swarmkit => moby/swarmkit/v2}/xnet/xnet_windows.go (100%) diff --git a/cmd/dockerd/daemon.go b/cmd/dockerd/daemon.go index dee52700f6..b23ce8e0ee 100644 --- a/cmd/dockerd/daemon.go +++ b/cmd/dockerd/daemon.go @@ -51,8 +51,8 @@ import ( "github.com/docker/docker/rootless" "github.com/docker/docker/runconfig" "github.com/docker/go-connections/tlsconfig" - swarmapi "github.com/docker/swarmkit/api" "github.com/moby/buildkit/session" + swarmapi "github.com/moby/swarmkit/v2/api" "github.com/pkg/errors" "github.com/sirupsen/logrus" "github.com/spf13/pflag" diff --git a/container/container.go b/container/container.go index a8f267fb59..9edbcbb0a7 100644 --- a/container/container.go +++ b/container/container.go @@ -36,7 +36,7 @@ import ( "github.com/docker/docker/volume" volumemounts "github.com/docker/docker/volume/mounts" units "github.com/docker/go-units" - agentexec "github.com/docker/swarmkit/agent/exec" + agentexec "github.com/moby/swarmkit/v2/agent/exec" "github.com/moby/sys/signal" "github.com/moby/sys/symlink" "github.com/pkg/errors" diff --git a/daemon/cluster/cluster.go b/daemon/cluster/cluster.go index 38a3822362..b4cede6e5a 100644 --- a/daemon/cluster/cluster.go +++ b/daemon/cluster/cluster.go @@ -55,8 +55,8 @@ import ( executorpkg "github.com/docker/docker/daemon/cluster/executor" lncluster "github.com/docker/docker/libnetwork/cluster" "github.com/docker/docker/pkg/stack" - swarmapi "github.com/docker/swarmkit/api" - swarmnode "github.com/docker/swarmkit/node" + swarmapi "github.com/moby/swarmkit/v2/api" + swarmnode "github.com/moby/swarmkit/v2/node" "github.com/pkg/errors" "github.com/sirupsen/logrus" "google.golang.org/grpc" diff --git a/daemon/cluster/configs.go b/daemon/cluster/configs.go index f44adb284e..d4f28a3c6c 100644 --- a/daemon/cluster/configs.go +++ b/daemon/cluster/configs.go @@ -6,7 +6,7 @@ import ( apitypes "github.com/docker/docker/api/types" types "github.com/docker/docker/api/types/swarm" "github.com/docker/docker/daemon/cluster/convert" - swarmapi "github.com/docker/swarmkit/api" + swarmapi "github.com/moby/swarmkit/v2/api" "google.golang.org/grpc" ) diff --git a/daemon/cluster/controllers/plugin/controller.go b/daemon/cluster/controllers/plugin/controller.go index 7d4b64a65d..5af7c9194f 100644 --- a/daemon/cluster/controllers/plugin/controller.go +++ b/daemon/cluster/controllers/plugin/controller.go @@ -11,8 +11,8 @@ import ( "github.com/docker/docker/errdefs" "github.com/docker/docker/plugin" v2 "github.com/docker/docker/plugin/v2" - "github.com/docker/swarmkit/api" "github.com/gogo/protobuf/proto" + "github.com/moby/swarmkit/v2/api" "github.com/pkg/errors" "github.com/sirupsen/logrus" ) diff --git a/daemon/cluster/convert/config.go b/daemon/cluster/convert/config.go index 16b3475af8..97e4f6cd5c 100644 --- a/daemon/cluster/convert/config.go +++ b/daemon/cluster/convert/config.go @@ -3,8 +3,8 @@ package convert // import "github.com/docker/docker/daemon/cluster/convert" import ( swarmtypes "github.com/docker/docker/api/types/swarm" types "github.com/docker/docker/api/types/swarm" - swarmapi "github.com/docker/swarmkit/api" gogotypes "github.com/gogo/protobuf/types" + swarmapi "github.com/moby/swarmkit/v2/api" ) // ConfigFromGRPC converts a grpc Config to a Config. diff --git a/daemon/cluster/convert/container.go b/daemon/cluster/convert/container.go index a743442331..936012489f 100644 --- a/daemon/cluster/convert/container.go +++ b/daemon/cluster/convert/container.go @@ -8,8 +8,8 @@ import ( mounttypes "github.com/docker/docker/api/types/mount" types "github.com/docker/docker/api/types/swarm" "github.com/docker/go-units" - swarmapi "github.com/docker/swarmkit/api" gogotypes "github.com/gogo/protobuf/types" + swarmapi "github.com/moby/swarmkit/v2/api" "github.com/pkg/errors" "github.com/sirupsen/logrus" ) diff --git a/daemon/cluster/convert/network.go b/daemon/cluster/convert/network.go index 356e7b7397..12bda728c7 100644 --- a/daemon/cluster/convert/network.go +++ b/daemon/cluster/convert/network.go @@ -7,8 +7,8 @@ import ( networktypes "github.com/docker/docker/api/types/network" types "github.com/docker/docker/api/types/swarm" netconst "github.com/docker/docker/libnetwork/datastore" - swarmapi "github.com/docker/swarmkit/api" gogotypes "github.com/gogo/protobuf/types" + swarmapi "github.com/moby/swarmkit/v2/api" ) func networkAttachmentFromGRPC(na *swarmapi.NetworkAttachment) types.NetworkAttachment { diff --git a/daemon/cluster/convert/network_test.go b/daemon/cluster/convert/network_test.go index 42f70696b7..e996a39d42 100644 --- a/daemon/cluster/convert/network_test.go +++ b/daemon/cluster/convert/network_test.go @@ -4,8 +4,8 @@ import ( "testing" "time" - swarmapi "github.com/docker/swarmkit/api" gogotypes "github.com/gogo/protobuf/types" + swarmapi "github.com/moby/swarmkit/v2/api" ) func TestNetworkConvertBasicNetworkFromGRPCCreatedAt(t *testing.T) { diff --git a/daemon/cluster/convert/node.go b/daemon/cluster/convert/node.go index 488fb909e6..ee502f269c 100644 --- a/daemon/cluster/convert/node.go +++ b/daemon/cluster/convert/node.go @@ -5,8 +5,8 @@ import ( "strings" types "github.com/docker/docker/api/types/swarm" - swarmapi "github.com/docker/swarmkit/api" gogotypes "github.com/gogo/protobuf/types" + swarmapi "github.com/moby/swarmkit/v2/api" ) // NodeFromGRPC converts a grpc Node to a Node. diff --git a/daemon/cluster/convert/secret.go b/daemon/cluster/convert/secret.go index d0e5ac45d2..0445dbf5d6 100644 --- a/daemon/cluster/convert/secret.go +++ b/daemon/cluster/convert/secret.go @@ -3,8 +3,8 @@ package convert // import "github.com/docker/docker/daemon/cluster/convert" import ( swarmtypes "github.com/docker/docker/api/types/swarm" types "github.com/docker/docker/api/types/swarm" - swarmapi "github.com/docker/swarmkit/api" gogotypes "github.com/gogo/protobuf/types" + swarmapi "github.com/moby/swarmkit/v2/api" ) // SecretFromGRPC converts a grpc Secret to a Secret. diff --git a/daemon/cluster/convert/service.go b/daemon/cluster/convert/service.go index 4161f89479..d30d95cb09 100644 --- a/daemon/cluster/convert/service.go +++ b/daemon/cluster/convert/service.go @@ -7,10 +7,10 @@ import ( types "github.com/docker/docker/api/types/swarm" "github.com/docker/docker/api/types/swarm/runtime" "github.com/docker/docker/pkg/namesgenerator" - swarmapi "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/api/genericresource" "github.com/gogo/protobuf/proto" gogotypes "github.com/gogo/protobuf/types" + swarmapi "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/api/genericresource" "github.com/pkg/errors" ) diff --git a/daemon/cluster/convert/service_test.go b/daemon/cluster/convert/service_test.go index 2b4ef94eee..dd0520e4c4 100644 --- a/daemon/cluster/convert/service_test.go +++ b/daemon/cluster/convert/service_test.go @@ -6,8 +6,8 @@ import ( containertypes "github.com/docker/docker/api/types/container" swarmtypes "github.com/docker/docker/api/types/swarm" "github.com/docker/docker/api/types/swarm/runtime" - swarmapi "github.com/docker/swarmkit/api" google_protobuf3 "github.com/gogo/protobuf/types" + swarmapi "github.com/moby/swarmkit/v2/api" "gotest.tools/v3/assert" ) diff --git a/daemon/cluster/convert/swarm.go b/daemon/cluster/convert/swarm.go index bdad2a5ea7..620852b589 100644 --- a/daemon/cluster/convert/swarm.go +++ b/daemon/cluster/convert/swarm.go @@ -5,9 +5,9 @@ import ( "strings" types "github.com/docker/docker/api/types/swarm" - swarmapi "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/ca" gogotypes "github.com/gogo/protobuf/types" + swarmapi "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/ca" ) // SwarmFromGRPC converts a grpc Cluster to a Swarm. diff --git a/daemon/cluster/convert/task.go b/daemon/cluster/convert/task.go index b29cf4871f..235316cf66 100644 --- a/daemon/cluster/convert/task.go +++ b/daemon/cluster/convert/task.go @@ -4,8 +4,8 @@ import ( "strings" types "github.com/docker/docker/api/types/swarm" - swarmapi "github.com/docker/swarmkit/api" gogotypes "github.com/gogo/protobuf/types" + swarmapi "github.com/moby/swarmkit/v2/api" ) // TaskFromGRPC converts a grpc Task to a Task. diff --git a/daemon/cluster/executor/backend.go b/daemon/cluster/executor/backend.go index b07c7bd53f..67dc8d626e 100644 --- a/daemon/cluster/executor/backend.go +++ b/daemon/cluster/executor/backend.go @@ -22,7 +22,7 @@ import ( networktypes "github.com/docker/docker/libnetwork/types" "github.com/docker/docker/plugin" volumeopts "github.com/docker/docker/volume/service/opts" - "github.com/docker/swarmkit/agent/exec" + "github.com/moby/swarmkit/v2/agent/exec" specs "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/daemon/cluster/executor/container/adapter.go b/daemon/cluster/executor/container/adapter.go index b8a7ece9a2..dd333c8b23 100644 --- a/daemon/cluster/executor/container/adapter.go +++ b/daemon/cluster/executor/container/adapter.go @@ -22,10 +22,10 @@ import ( executorpkg "github.com/docker/docker/daemon/cluster/executor" "github.com/docker/docker/libnetwork" volumeopts "github.com/docker/docker/volume/service/opts" - "github.com/docker/swarmkit/agent/exec" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/log" gogotypes "github.com/gogo/protobuf/types" + "github.com/moby/swarmkit/v2/agent/exec" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/log" "github.com/opencontainers/go-digest" "github.com/pkg/errors" "github.com/sirupsen/logrus" diff --git a/daemon/cluster/executor/container/adapter_test.go b/daemon/cluster/executor/container/adapter_test.go index c4ef2affbb..d45fc27773 100644 --- a/daemon/cluster/executor/container/adapter_test.go +++ b/daemon/cluster/executor/container/adapter_test.go @@ -7,7 +7,7 @@ import ( "time" "github.com/docker/docker/daemon" - "github.com/docker/swarmkit/api" + "github.com/moby/swarmkit/v2/api" ) // TestWaitNodeAttachment tests that the waitNodeAttachment method successfully diff --git a/daemon/cluster/executor/container/attachment.go b/daemon/cluster/executor/container/attachment.go index f0aa0b9577..eb1b25e222 100644 --- a/daemon/cluster/executor/container/attachment.go +++ b/daemon/cluster/executor/container/attachment.go @@ -4,8 +4,8 @@ import ( "context" executorpkg "github.com/docker/docker/daemon/cluster/executor" - "github.com/docker/swarmkit/agent/exec" - "github.com/docker/swarmkit/api" + "github.com/moby/swarmkit/v2/agent/exec" + "github.com/moby/swarmkit/v2/api" ) // networkAttacherController implements agent.Controller against docker's API. diff --git a/daemon/cluster/executor/container/container.go b/daemon/cluster/executor/container/container.go index 7ee0b0dee5..ecc8483036 100644 --- a/daemon/cluster/executor/container/container.go +++ b/daemon/cluster/executor/container/container.go @@ -23,11 +23,11 @@ import ( netconst "github.com/docker/docker/libnetwork/datastore" "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/template" gogotypes "github.com/gogo/protobuf/types" + "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/template" ) const ( diff --git a/daemon/cluster/executor/container/container_test.go b/daemon/cluster/executor/container/container_test.go index 88ba8beb1c..725c361bc8 100644 --- a/daemon/cluster/executor/container/container_test.go +++ b/daemon/cluster/executor/container/container_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/docker/docker/api/types/container" - swarmapi "github.com/docker/swarmkit/api" + swarmapi "github.com/moby/swarmkit/v2/api" "gotest.tools/v3/assert" ) diff --git a/daemon/cluster/executor/container/controller.go b/daemon/cluster/executor/container/controller.go index e3491a4b95..e2c037bc34 100644 --- a/daemon/cluster/executor/container/controller.go +++ b/daemon/cluster/executor/container/controller.go @@ -13,10 +13,10 @@ import ( executorpkg "github.com/docker/docker/daemon/cluster/executor" "github.com/docker/docker/libnetwork" "github.com/docker/go-connections/nat" - "github.com/docker/swarmkit/agent/exec" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/log" gogotypes "github.com/gogo/protobuf/types" + "github.com/moby/swarmkit/v2/agent/exec" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/log" "github.com/pkg/errors" "golang.org/x/time/rate" ) diff --git a/daemon/cluster/executor/container/executor.go b/daemon/cluster/executor/container/executor.go index 8aaada238e..7a3e38876f 100644 --- a/daemon/cluster/executor/container/executor.go +++ b/daemon/cluster/executor/container/executor.go @@ -17,12 +17,12 @@ import ( clustertypes "github.com/docker/docker/daemon/cluster/provider" "github.com/docker/docker/libnetwork" networktypes "github.com/docker/docker/libnetwork/types" - "github.com/docker/swarmkit/agent" - "github.com/docker/swarmkit/agent/exec" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/api/naming" - "github.com/docker/swarmkit/log" - "github.com/docker/swarmkit/template" + "github.com/moby/swarmkit/v2/agent" + "github.com/moby/swarmkit/v2/agent/exec" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/api/naming" + "github.com/moby/swarmkit/v2/log" + "github.com/moby/swarmkit/v2/template" "github.com/pkg/errors" "github.com/sirupsen/logrus" ) diff --git a/daemon/cluster/executor/container/health_test.go b/daemon/cluster/executor/container/health_test.go index 3c2aeb6d17..d1eb8616b9 100644 --- a/daemon/cluster/executor/container/health_test.go +++ b/daemon/cluster/executor/container/health_test.go @@ -12,7 +12,7 @@ import ( "github.com/docker/docker/container" "github.com/docker/docker/daemon" "github.com/docker/docker/daemon/events" - "github.com/docker/swarmkit/api" + "github.com/moby/swarmkit/v2/api" ) func TestHealthStates(t *testing.T) { diff --git a/daemon/cluster/executor/container/validate.go b/daemon/cluster/executor/container/validate.go index b90eb98988..2fb2492a5c 100644 --- a/daemon/cluster/executor/container/validate.go +++ b/daemon/cluster/executor/container/validate.go @@ -5,7 +5,7 @@ import ( "fmt" "path/filepath" - "github.com/docker/swarmkit/api" + "github.com/moby/swarmkit/v2/api" ) func validateMounts(mounts []api.Mount) error { diff --git a/daemon/cluster/executor/container/validate_test.go b/daemon/cluster/executor/container/validate_test.go index a7fa270998..ae567c439a 100644 --- a/daemon/cluster/executor/container/validate_test.go +++ b/daemon/cluster/executor/container/validate_test.go @@ -7,7 +7,7 @@ import ( "github.com/docker/docker/daemon" "github.com/docker/docker/pkg/stringid" - "github.com/docker/swarmkit/api" + "github.com/moby/swarmkit/v2/api" ) func newTestControllerWithMount(m api.Mount) (*controller, error) { diff --git a/daemon/cluster/executor/container/validate_windows_test.go b/daemon/cluster/executor/container/validate_windows_test.go index 09f3ff4a1e..1b1b2f13f6 100644 --- a/daemon/cluster/executor/container/validate_windows_test.go +++ b/daemon/cluster/executor/container/validate_windows_test.go @@ -6,7 +6,7 @@ import ( "strings" "testing" - "github.com/docker/swarmkit/api" + "github.com/moby/swarmkit/v2/api" ) const ( diff --git a/daemon/cluster/filters.go b/daemon/cluster/filters.go index 9a3180b838..627e826d50 100644 --- a/daemon/cluster/filters.go +++ b/daemon/cluster/filters.go @@ -6,7 +6,7 @@ import ( "github.com/docker/docker/api/types/filters" runconfigopts "github.com/docker/docker/runconfig/opts" - swarmapi "github.com/docker/swarmkit/api" + swarmapi "github.com/moby/swarmkit/v2/api" ) func newListNodesFilters(filter filters.Args) (*swarmapi.ListNodesRequest_Filters, error) { diff --git a/daemon/cluster/helpers.go b/daemon/cluster/helpers.go index 653593e1c0..fc96ccc1a6 100644 --- a/daemon/cluster/helpers.go +++ b/daemon/cluster/helpers.go @@ -5,7 +5,7 @@ import ( "fmt" "github.com/docker/docker/errdefs" - swarmapi "github.com/docker/swarmkit/api" + swarmapi "github.com/moby/swarmkit/v2/api" "github.com/pkg/errors" ) diff --git a/daemon/cluster/networks.go b/daemon/cluster/networks.go index bcda316ca2..65fd9735cd 100644 --- a/daemon/cluster/networks.go +++ b/daemon/cluster/networks.go @@ -12,7 +12,7 @@ import ( internalnetwork "github.com/docker/docker/daemon/network" "github.com/docker/docker/errdefs" "github.com/docker/docker/runconfig" - swarmapi "github.com/docker/swarmkit/api" + swarmapi "github.com/moby/swarmkit/v2/api" "github.com/pkg/errors" "github.com/sirupsen/logrus" ) diff --git a/daemon/cluster/noderunner.go b/daemon/cluster/noderunner.go index 6bb2f47448..38c41e80be 100644 --- a/daemon/cluster/noderunner.go +++ b/daemon/cluster/noderunner.go @@ -11,9 +11,9 @@ import ( types "github.com/docker/docker/api/types/swarm" "github.com/docker/docker/daemon/cluster/executor/container" lncluster "github.com/docker/docker/libnetwork/cluster" - swarmapi "github.com/docker/swarmkit/api" - swarmallocator "github.com/docker/swarmkit/manager/allocator/cnmallocator" - swarmnode "github.com/docker/swarmkit/node" + swarmapi "github.com/moby/swarmkit/v2/api" + swarmallocator "github.com/moby/swarmkit/v2/manager/allocator/cnmallocator" + swarmnode "github.com/moby/swarmkit/v2/node" "github.com/pkg/errors" "github.com/sirupsen/logrus" "google.golang.org/grpc" diff --git a/daemon/cluster/nodes.go b/daemon/cluster/nodes.go index f0d70fe1ff..7f643d833a 100644 --- a/daemon/cluster/nodes.go +++ b/daemon/cluster/nodes.go @@ -7,7 +7,7 @@ import ( types "github.com/docker/docker/api/types/swarm" "github.com/docker/docker/daemon/cluster/convert" "github.com/docker/docker/errdefs" - swarmapi "github.com/docker/swarmkit/api" + swarmapi "github.com/moby/swarmkit/v2/api" "google.golang.org/grpc" ) diff --git a/daemon/cluster/secrets.go b/daemon/cluster/secrets.go index 6f652eb54d..bbc2fdb8d0 100644 --- a/daemon/cluster/secrets.go +++ b/daemon/cluster/secrets.go @@ -6,7 +6,7 @@ import ( apitypes "github.com/docker/docker/api/types" types "github.com/docker/docker/api/types/swarm" "github.com/docker/docker/daemon/cluster/convert" - swarmapi "github.com/docker/swarmkit/api" + swarmapi "github.com/moby/swarmkit/v2/api" "google.golang.org/grpc" ) diff --git a/daemon/cluster/services.go b/daemon/cluster/services.go index 5b7536b0e2..8a04a3ab06 100644 --- a/daemon/cluster/services.go +++ b/daemon/cluster/services.go @@ -19,8 +19,8 @@ import ( "github.com/docker/docker/daemon/cluster/convert" "github.com/docker/docker/errdefs" runconfigopts "github.com/docker/docker/runconfig/opts" - swarmapi "github.com/docker/swarmkit/api" gogotypes "github.com/gogo/protobuf/types" + swarmapi "github.com/moby/swarmkit/v2/api" "github.com/pkg/errors" "github.com/sirupsen/logrus" "google.golang.org/grpc" diff --git a/daemon/cluster/swarm.go b/daemon/cluster/swarm.go index b5b2ffd765..71ff0ef475 100644 --- a/daemon/cluster/swarm.go +++ b/daemon/cluster/swarm.go @@ -14,9 +14,9 @@ import ( "github.com/docker/docker/errdefs" "github.com/docker/docker/opts" "github.com/docker/docker/pkg/stack" - swarmapi "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/manager/encryption" - swarmnode "github.com/docker/swarmkit/node" + swarmapi "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/manager/encryption" + swarmnode "github.com/moby/swarmkit/v2/node" "github.com/pkg/errors" "github.com/sirupsen/logrus" "google.golang.org/grpc" diff --git a/daemon/cluster/tasks.go b/daemon/cluster/tasks.go index f1001ea0ba..ec81538707 100644 --- a/daemon/cluster/tasks.go +++ b/daemon/cluster/tasks.go @@ -7,7 +7,7 @@ import ( "github.com/docker/docker/api/types/filters" types "github.com/docker/docker/api/types/swarm" "github.com/docker/docker/daemon/cluster/convert" - swarmapi "github.com/docker/swarmkit/api" + swarmapi "github.com/moby/swarmkit/v2/api" "google.golang.org/grpc" ) diff --git a/daemon/config/opts.go b/daemon/config/opts.go index 8b114929fb..a88fb94178 100644 --- a/daemon/config/opts.go +++ b/daemon/config/opts.go @@ -3,7 +3,7 @@ package config // import "github.com/docker/docker/daemon/config" import ( "github.com/docker/docker/api/types/swarm" "github.com/docker/docker/daemon/cluster/convert" - "github.com/docker/swarmkit/api/genericresource" + "github.com/moby/swarmkit/v2/api/genericresource" ) // ParseGenericResources parses and validates the specified string as a list of GenericResource diff --git a/daemon/dependency.go b/daemon/dependency.go index 45275dbf4c..5a3867533a 100644 --- a/daemon/dependency.go +++ b/daemon/dependency.go @@ -1,7 +1,7 @@ package daemon // import "github.com/docker/docker/daemon" import ( - "github.com/docker/swarmkit/agent/exec" + "github.com/moby/swarmkit/v2/agent/exec" ) // SetContainerDependencyStore sets the dependency store backend for the container diff --git a/daemon/events.go b/daemon/events.go index 169b7348a1..c2a064fe46 100644 --- a/daemon/events.go +++ b/daemon/events.go @@ -11,8 +11,8 @@ import ( "github.com/docker/docker/container" daemonevents "github.com/docker/docker/daemon/events" "github.com/docker/docker/libnetwork" - swarmapi "github.com/docker/swarmkit/api" gogotypes "github.com/gogo/protobuf/types" + swarmapi "github.com/moby/swarmkit/v2/api" "github.com/sirupsen/logrus" ) diff --git a/daemon/oci_windows_test.go b/daemon/oci_windows_test.go index d9695a58eb..ea0330b368 100644 --- a/daemon/oci_windows_test.go +++ b/daemon/oci_windows_test.go @@ -11,8 +11,8 @@ import ( containertypes "github.com/docker/docker/api/types/container" "github.com/docker/docker/container" - swarmagent "github.com/docker/swarmkit/agent" - swarmapi "github.com/docker/swarmkit/api" + swarmagent "github.com/moby/swarmkit/v2/agent" + swarmapi "github.com/moby/swarmkit/v2/api" specs "github.com/opencontainers/runtime-spec/specs-go" "golang.org/x/sys/windows/registry" "gotest.tools/v3/assert" diff --git a/integration-cli/docker_api_swarm_test.go b/integration-cli/docker_api_swarm_test.go index 441f7a1652..8182f85ed8 100644 --- a/integration-cli/docker_api_swarm_test.go +++ b/integration-cli/docker_api_swarm_test.go @@ -27,7 +27,7 @@ import ( "github.com/docker/docker/integration-cli/daemon" testdaemon "github.com/docker/docker/testutil/daemon" "github.com/docker/docker/testutil/request" - "github.com/docker/swarmkit/ca" + "github.com/moby/swarmkit/v2/ca" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" "gotest.tools/v3/poll" diff --git a/integration-cli/docker_cli_swarm_test.go b/integration-cli/docker_cli_swarm_test.go index 609095c500..dd35e0f749 100644 --- a/integration-cli/docker_cli_swarm_test.go +++ b/integration-cli/docker_cli_swarm_test.go @@ -27,7 +27,7 @@ import ( "github.com/docker/docker/libnetwork/driverapi" "github.com/docker/docker/libnetwork/ipamapi" remoteipam "github.com/docker/docker/libnetwork/ipams/remote/api" - "github.com/docker/swarmkit/ca/keyutils" + "github.com/moby/swarmkit/v2/ca/keyutils" "github.com/vishvananda/netlink" "gotest.tools/v3/assert" "gotest.tools/v3/fs" diff --git a/vendor.mod b/vendor.mod index 908f416f2c..642a58eb71 100644 --- a/vendor.mod +++ b/vendor.mod @@ -7,7 +7,7 @@ module github.com/docker/docker go 1.17 require ( - cloud.google.com/go v0.92.0 + cloud.google.com/go v0.93.3 cloud.google.com/go/logging v1.4.2 github.com/Graylog2/go-gelf v0.0.0-20191017102106-1550ee647df0 github.com/Microsoft/go-winio v0.5.1 @@ -32,7 +32,6 @@ require ( github.com/docker/go-units v0.4.0 github.com/docker/libkv v0.2.2-0.20211217103745-e480589147e3 github.com/docker/libtrust v0.0.0-20150526203908-9cbd2a1374f4 - github.com/docker/swarmkit v1.12.1-0.20220307221335-616e8db4c3b0 github.com/fluent/fluent-logger-golang v1.9.0 github.com/fsnotify/fsnotify v1.5.1 github.com/godbus/dbus/v5 v5.0.6 @@ -42,17 +41,18 @@ require ( github.com/google/uuid v1.3.0 github.com/gorilla/mux v1.8.0 github.com/hashicorp/go-immutable-radix v1.3.1 - github.com/hashicorp/go-memdb v0.0.0-20161216180745-cb9a474f84cc + github.com/hashicorp/go-memdb v1.3.2 github.com/hashicorp/memberlist v0.2.4 github.com/hashicorp/serf v0.8.2 github.com/imdario/mergo v0.3.12 - github.com/ishidawataru/sctp v0.0.0-20210226210310-f2269e66cdee + github.com/ishidawataru/sctp v0.0.0-20210707070123-9a39160e9062 github.com/klauspost/compress v1.15.1 github.com/miekg/dns v1.1.27 github.com/mistifyio/go-zfs v2.1.2-0.20190413222219-f784269be439+incompatible github.com/moby/buildkit v0.10.1-0.20220327110152-d7744bcb3532 github.com/moby/ipvs v1.0.1 github.com/moby/locker v1.0.1 + github.com/moby/swarmkit/v2 v2.0.0-20220420172245-6068d1894d46 github.com/moby/sys/mount v0.3.1 github.com/moby/sys/mountinfo v0.6.0 github.com/moby/sys/signal v0.7.0 @@ -60,7 +60,7 @@ require ( github.com/moby/term v0.0.0-20210619224110-3f7ff695adc6 github.com/morikuni/aec v1.0.0 github.com/opencontainers/go-digest v1.0.0 - github.com/opencontainers/image-spec v1.0.2-0.20211117181255-693428a734f5 + github.com/opencontainers/image-spec v1.0.3-0.20220303224323-02efb9a75ee1 github.com/opencontainers/runc v1.1.1 github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417 github.com/opencontainers/selinux v1.10.0 @@ -91,7 +91,6 @@ require ( code.cloudfoundry.org/clock v1.0.0 // indirect github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect github.com/agext/levenshtein v1.2.3 // indirect - github.com/akutz/memconn v0.1.0 // indirect github.com/armon/circbuf v0.0.0-20190214190532-5111143e8da2 // indirect github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da // indirect github.com/beorn7/perks v1.0.1 // indirect @@ -114,7 +113,7 @@ require ( github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect github.com/golang/protobuf v1.5.2 // indirect github.com/google/btree v1.0.1 // indirect - github.com/google/certificate-transparency-go v1.0.20 // indirect + github.com/google/certificate-transparency-go v1.1.2 // indirect github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect github.com/googleapis/gax-go/v2 v2.0.5 // indirect github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 // indirect @@ -124,7 +123,7 @@ require ( github.com/hashicorp/go-msgpack v0.5.3 // indirect github.com/hashicorp/go-multierror v1.1.1 // indirect github.com/hashicorp/go-sockaddr v1.0.2 // indirect - github.com/hashicorp/golang-lru v0.5.3 // indirect + github.com/hashicorp/golang-lru v0.5.4 // indirect github.com/inconshreveable/mousetrap v1.0.0 // indirect github.com/jmespath/go-jmespath v0.3.0 // indirect github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect @@ -184,3 +183,9 @@ replace ( // Removes etcd dependency replace github.com/rexray/gocsi => github.com/dperny/gocsi v1.2.3-pre + +// Resolve dependency hell with github.com/cloudflare/cfssl (transitive via +// swarmkit) by pinning the certificate-transparency-go version. Remove once +// module go.etcd.io/etcd/server/v3 has upgraded its dependency on +// go.opentelemetry.io/otel to v1. +replace github.com/google/certificate-transparency-go => github.com/google/certificate-transparency-go v1.0.20 diff --git a/vendor.sum b/vendor.sum index b655aaa9c5..512f6e2f93 100644 --- a/vendor.sum +++ b/vendor.sum @@ -24,8 +24,8 @@ cloud.google.com/go v0.83.0/go.mod h1:Z7MJUsANfY0pYPdw0lbnivPx4/vhy/e2FEkSkF7vAV cloud.google.com/go v0.84.0/go.mod h1:RazrYuxIK6Kb7YrzzhPoLmCVzl7Sup4NrbKPg8KHSUM= cloud.google.com/go v0.87.0/go.mod h1:TpDYlFy7vuLzZMMZ+B6iRiELaY7z/gJPaqbMx6mlWcY= cloud.google.com/go v0.90.0/go.mod h1:kRX0mNRHe0e2rC6oNakvwQqzyDmg57xJ+SZU1eT2aDQ= -cloud.google.com/go v0.92.0 h1:gx+SLyeAiq8Et/uxOrHPuLgu3ZQ2TguaO1OE9P05QsQ= -cloud.google.com/go v0.92.0/go.mod h1:cMc7asehN84LBi1JGTHo4n8wuaGuNAZ7lR7b1YNJBrE= +cloud.google.com/go v0.93.3 h1:wPBktZFzYBcCZVARvwVKqH1uEj+aLXofJEtrb4oOsio= +cloud.google.com/go v0.93.3/go.mod h1:8utlLll2EF5XMAV15woO4lSbWQlk8rer9aLOfLh7+YI= cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o= cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE= cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc= @@ -369,8 +369,6 @@ github.com/docker/libtrust v0.0.0-20150114040149-fa567046d9b1/go.mod h1:cyGadeNE github.com/docker/libtrust v0.0.0-20150526203908-9cbd2a1374f4 h1:k8TfKGeAcDQFFQOGCQMRN04N4a9YrPlRMMKnzAuvM9Q= github.com/docker/libtrust v0.0.0-20150526203908-9cbd2a1374f4/go.mod h1:cyGadeNEkKy96OOhEzfZl+yxihPEzKnqJwvfuSUqbZE= github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96/go.mod h1:Qh8CwZgvJUkLughtfhJv5dyTYa91l1fOUCrgjqmcifM= -github.com/docker/swarmkit v1.12.1-0.20220307221335-616e8db4c3b0 h1:YehAv2BPLfTm58HW04wRnNy8Oo/CAzWji7mjJ6UJWgM= -github.com/docker/swarmkit v1.12.1-0.20220307221335-616e8db4c3b0/go.mod h1:n3Z4lIEl7g261ptkGDBcYi/3qBMDl9csaAhwi2MPejs= 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= @@ -549,7 +547,6 @@ github.com/google/pprof v0.0.0-20210226084205-cbba55b83ad5/go.mod h1:kpwsk12EmLe github.com/google/pprof v0.0.0-20210601050228-01bbb1931b22/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20210609004039-a478d1d731e9/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= -github.com/google/pprof v0.0.0-20210804190019-f964ff605595/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 h1:El6M4kTTCOh6aBiKaUGG7oYTSPP8MxqL4YI3kZKwcP4= github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510/go.mod h1:pupxD2MaaD3pAXIBCelhxNneeOaAeabZDe5s4K6zSpQ= @@ -595,10 +592,11 @@ github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brv 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= github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= +github.com/hashicorp/go-immutable-radix v1.3.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= github.com/hashicorp/go-immutable-radix v1.3.1 h1:DKHmCUm2hRBK510BaiZlwvpD40f8bJFeZnpfm2KLowc= github.com/hashicorp/go-immutable-radix v1.3.1/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= -github.com/hashicorp/go-memdb v0.0.0-20161216180745-cb9a474f84cc h1:+a6OGop8lqksGF5BgpRVghkeR3vy2HDa7lDKx6UvSRE= -github.com/hashicorp/go-memdb v0.0.0-20161216180745-cb9a474f84cc/go.mod h1:kbfItVoBJwCfKXDXN4YoAXjxcFVZ7MRrJzyTX6H4giE= +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.0.0-20140221154404-71c2886f5a67 h1:uUGuA3Cnfp7qbFpIMOCDVz3TaWIF4lLYM8PE3YHpoA4= github.com/hashicorp/go-msgpack v0.0.0-20140221154404-71c2886f5a67/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM= github.com/hashicorp/go-multierror v1.0.0 h1:iVjPR7a6H0tWELX5NxNe7bYopibicUzc7uPribsnS6o= @@ -613,8 +611,8 @@ github.com/hashicorp/go-uuid v1.0.1 h1:fv1ep09latC32wFoVwnqcnKJGnMSdBanPczbHAYm1 github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= -github.com/hashicorp/golang-lru v0.5.3 h1:YPkqC67at8FYaadspW/6uE0COsBxS2656RLEr8Bppgk= -github.com/hashicorp/golang-lru v0.5.3/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4= +github.com/hashicorp/golang-lru v0.5.4 h1:YDjusn29QI/Das2iO9M0BHnIbxPeyuCHsjMW+lJfyTc= +github.com/hashicorp/golang-lru v0.5.4/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4= github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= github.com/hashicorp/memberlist v0.2.4 h1:OOhYzSvFnkFQXm1ysE8RjXTHsqSRDyP4emusC9K7DYg= github.com/hashicorp/memberlist v0.2.4/go.mod h1:MS2lj3INKhZjWNqd3N0m3J+Jxf3DAOnAH9VT3Sh9MUE= @@ -634,8 +632,8 @@ github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NH github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= github.com/insomniacslk/dhcp v0.0.0-20220119180841-3c283ff8b7dd/go.mod h1:h+MxyHxRg9NH3terB1nfRIUaQEcI0XOVkdR9LNBlp8E= github.com/intel/goresctrl v0.2.0/go.mod h1:+CZdzouYFn5EsxgqAQTEzMfwKwuc0fVdMrT9FCCAVRQ= -github.com/ishidawataru/sctp v0.0.0-20210226210310-f2269e66cdee h1:PAXLXk1heNZ5yokbMBpVLZQxo43wCZxRwl00mX+dd44= -github.com/ishidawataru/sctp v0.0.0-20210226210310-f2269e66cdee/go.mod h1:co9pwDoBCm1kGxawmb4sPq0cSIOOWNPT4KnHotMP1Zg= +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/j-keck/arping v1.0.2/go.mod h1:aJbELhR92bSk7tp79AWM/ftfc90EfEi2bQJrbBFOsPw= github.com/jmespath/go-jmespath v0.0.0-20160202185014-0b12d6b521d8/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= @@ -732,6 +730,8 @@ github.com/moby/ipvs v1.0.1/go.mod h1:2pngiyseZbIKXNv7hsKj3O9UEz30c53MT9005gt2hx github.com/moby/locker v1.0.1 h1:fOXqR41zeveg4fFODix+1Ch4mj/gT0NE1XJbp/epuBg= github.com/moby/locker v1.0.1/go.mod h1:S7SDdo5zpBK84bzzVlKr2V0hz+7x9hWbYC/kq7oQppc= github.com/moby/spdystream v0.2.0/go.mod h1:f7i0iNDQJ059oMTcWxx8MA/zKFIuD/lY+0GqbN2Wy8c= +github.com/moby/swarmkit/v2 v2.0.0-20220420172245-6068d1894d46 h1:FVr9eatIpN7PlE2ZHP850rIJ6AQoZxoZvPSDR+WQY38= +github.com/moby/swarmkit/v2 v2.0.0-20220420172245-6068d1894d46/go.mod h1:/so6Lct4y1x14UprW/loFsOe6xoXVTlvh25V36ULXNQ= github.com/moby/sys/mount v0.3.1 h1:RX1K0x95oR8j5P1YefKDt7tE1C2kCCixV0H8Aza3GaI= github.com/moby/sys/mount v0.3.1/go.mod h1:6IZknFQiqjLpwuYJD5Zk0qYEuJiws36M88MIXnZHya0= github.com/moby/sys/mountinfo v0.4.0/go.mod h1:rEr8tzG/lsIZHBtN/JjGG+LMYx9eXgW2JI+6q0qou+A= @@ -802,8 +802,9 @@ github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8 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-0.20211117181255-693428a734f5 h1:q37d91F6BO4Jp1UqWiun0dUFYaqv6WsKTLTCaWv+8LY= github.com/opencontainers/image-spec v1.0.2-0.20211117181255-693428a734f5/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0= +github.com/opencontainers/image-spec v1.0.3-0.20220303224323-02efb9a75ee1 h1:9iFHD5Kt9hkOfeawBNiEeEaV7bmC4/Z5wJp8E9BptMs= +github.com/opencontainers/image-spec v1.0.3-0.20220303224323-02efb9a75ee1/go.mod h1:K/JAU0m27RFhDRX4PcFdIKntROP6y5Ed6O91aZYDQfs= 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= @@ -867,6 +868,7 @@ github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFR github.com/rootless-containers/rootlesskit v1.0.0 h1:+DI5RQEZa4OOnkOixkrezFye0XLlSsdrtGSP6+g1254= github.com/rootless-containers/rootlesskit v1.0.0/go.mod h1:8Lo4zb73rSW3seB+a7UuO1gAoRD1pVkKMbXEY3NFNTE= github.com/rs/xid v1.3.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg= +github.com/russross/blackfriday v1.6.0/go.mod h1:ti0ldHuxg49ri4ksnFxlkCfN+hvslNlmVHqNRXXJNAY= github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/ryanuber/columnize v2.1.0+incompatible/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= @@ -974,6 +976,7 @@ github.com/willf/bitset v1.1.11/go.mod h1:83CECat5yLh5zVOf4P1ErAgKA5UDvKtgyUABdr 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/xeipuuv/gojsonschema v1.2.0/go.mod h1:anYRn/JVcOK2ZgGU+IjEV4nwlhoK5sQluxsYJ78Id3Y= github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q= github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= diff --git a/vendor/cloud.google.com/go/doc.go b/vendor/cloud.google.com/go/doc.go index b667cc8b25..746696f371 100644 --- a/vendor/cloud.google.com/go/doc.go +++ b/vendor/cloud.google.com/go/doc.go @@ -28,8 +28,50 @@ Authentication and Authorization All the clients in sub-packages support authentication via Google Application Default Credentials (see https://cloud.google.com/docs/authentication/production), or -by providing a JSON key file for a Service Account. See the authentication examples -in this package for details. +by providing a JSON key file for a Service Account. See examples below. + +Google Application Default Credentials (ADC) is the recommended way to authorize +and authenticate clients. For information on how to create and obtain +Application Default Credentials, see +https://cloud.google.com/docs/authentication/production. Here is an example +of a client using ADC to authenticate: + client, err := secretmanager.NewClient(context.Background()) + if err != nil { + // TODO: handle error. + } + _ = client // Use the client. + +You can use a file with credentials to authenticate and authorize, such as a JSON +key file associated with a Google service account. Service Account keys can be +created and downloaded from +https://console.cloud.google.com/iam-admin/serviceaccounts. This example uses +the Secret Manger client, but the same steps apply to the other client libraries +underneath this package. Example: + client, err := secretmanager.NewClient(context.Background(), + option.WithCredentialsFile("/path/to/service-account-key.json")) + if err != nil { + // TODO: handle error. + } + _ = client // Use the client. + +In some cases (for instance, you don't want to store secrets on disk), you can +create credentials from in-memory JSON and use the WithCredentials option. +The google package in this example is at golang.org/x/oauth2/google. +This example uses the Secret Manager client, but the same steps apply to +the other client libraries underneath this package. Note that scopes can be +found at https://developers.google.com/identity/protocols/oauth2/scopes, and +are also provided in all auto-generated libraries: for example, +cloud.google.com/go/secretmanager/apiv1 provides DefaultAuthScopes. Example: + ctx := context.Background() + creds, err := google.CredentialsFromJSON(ctx, []byte("JSON creds"), secretmanager.DefaultAuthScopes()...) + if err != nil { + // TODO: handle error. + } + client, err := secretmanager.NewClient(ctx, option.WithCredentials(creds)) + if err != nil { + // TODO: handle error. + } + _ = client // Use the client. Timeouts and Cancellation @@ -37,9 +79,45 @@ Timeouts and Cancellation By default, non-streaming methods, like Create or Get, will have a default deadline applied to the context provided at call time, unless a context deadline is already set. Streaming methods have no default deadline and will run indefinitely. To set timeouts or -arrange for cancellation, use contexts. See the examples for details. Transient +arrange for cancellation, use contexts. Transient errors will be retried when correctness allows. +Here is an example of how to set a timeout for an RPC, use context.WithTimeout: + ctx := context.Background() + // Do not set a timeout on the context passed to NewClient: dialing happens + // asynchronously, and the context is used to refresh credentials in the + // background. + client, err := secretmanager.NewClient(ctx) + if err != nil { + // TODO: handle error. + } + // Time out if it takes more than 10 seconds to create a dataset. + tctx, cancel := context.WithTimeout(ctx, 10*time.Second) + defer cancel() // Always call cancel. + + req := &secretmanagerpb.DeleteSecretRequest{Name: "projects/project-id/secrets/name"} + if err := client.DeleteSecret(tctx, req); err != nil { + // TODO: handle error. + } + +Here is an example of how to arrange for an RPC to be canceled, use context.WithCancel: + ctx := context.Background() + // Do not cancel the context passed to NewClient: dialing happens asynchronously, + // and the context is used to refresh credentials in the background. + client, err := secretmanager.NewClient(ctx) + if err != nil { + // TODO: handle error. + } + cctx, cancel := context.WithCancel(ctx) + defer cancel() // Always call cancel. + + // TODO: Make the cancel function available to whatever might want to cancel the + // call--perhaps a GUI button. + req := &secretmanagerpb.DeleteSecretRequest{Name: "projects/proj/secrets/name"} + if err := client.DeleteSecret(cctx, req); err != nil { + // TODO: handle error. + } + To opt out of default deadlines, set the temporary environment variable GOOGLE_API_GO_EXPERIMENTAL_DISABLE_DEFAULT_DEADLINE to "true" prior to client creation. This affects all Google Cloud Go client libraries. This opt-out diff --git a/vendor/github.com/hashicorp/go-memdb/.gitignore b/vendor/github.com/hashicorp/go-memdb/.gitignore index daf913b1b3..11b90db8d9 100644 --- a/vendor/github.com/hashicorp/go-memdb/.gitignore +++ b/vendor/github.com/hashicorp/go-memdb/.gitignore @@ -22,3 +22,5 @@ _testmain.go *.exe *.test *.prof + +.idea diff --git a/vendor/github.com/hashicorp/go-memdb/README.md b/vendor/github.com/hashicorp/go-memdb/README.md index 203a0af14b..080b7447b2 100644 --- a/vendor/github.com/hashicorp/go-memdb/README.md +++ b/vendor/github.com/hashicorp/go-memdb/README.md @@ -1,9 +1,9 @@ -# go-memdb +# go-memdb [![CircleCI](https://circleci.com/gh/hashicorp/go-memdb/tree/master.svg?style=svg)](https://circleci.com/gh/hashicorp/go-memdb/tree/master) Provides the `memdb` package that implements a simple in-memory database built on immutable radix trees. The database provides Atomicity, Consistency and Isolation from ACID. Being that it is in-memory, it does not provide durability. -The database is instantiated with a schema that specifies the tables and indicies +The database is instantiated with a schema that specifies the tables and indices that exist and allows transactions to be executed. The database provides the following: @@ -19,58 +19,75 @@ The database provides the following: * Rich Indexing - Tables can support any number of indexes, which can be simple like a single field index, or more advanced compound field indexes. Certain types like - UUID can be efficiently compressed from strings into byte indexes for reduces + UUID can be efficiently compressed from strings into byte indexes for reduced storage requirements. +* Watches - Callers can populate a watch set as part of a query, which can be used to + detect when a modification has been made to the database which affects the query + results. This lets callers easily watch for changes in the database in a very general + way. + For the underlying immutable radix trees, see [go-immutable-radix](https://github.com/hashicorp/go-immutable-radix). Documentation ============= -The full documentation is available on [Godoc](http://godoc.org/github.com/hashicorp/go-memdb). +The full documentation is available on [Godoc](https://pkg.go.dev/github.com/hashicorp/go-memdb). Example ======= -Below is a simple example of usage +Below is a [simple example](https://play.golang.org/p/gCGE9FA4og1) of usage ```go // Create a sample struct type Person struct { - Email string - Name string - Age int + Email string + Name string + Age int } // Create the DB schema schema := &memdb.DBSchema{ - Tables: map[string]*memdb.TableSchema{ - "person": &memdb.TableSchema{ - Name: "person", - Indexes: map[string]*memdb.IndexSchema{ - "id": &memdb.IndexSchema{ - Name: "id", - Unique: true, - Indexer: &memdb.StringFieldIndex{Field: "Email"}, - }, - }, - }, - }, + Tables: map[string]*memdb.TableSchema{ + "person": &memdb.TableSchema{ + Name: "person", + Indexes: map[string]*memdb.IndexSchema{ + "id": &memdb.IndexSchema{ + Name: "id", + Unique: true, + Indexer: &memdb.StringFieldIndex{Field: "Email"}, + }, + "age": &memdb.IndexSchema{ + Name: "age", + Unique: false, + Indexer: &memdb.IntFieldIndex{Field: "Age"}, + }, + }, + }, + }, } // Create a new data base db, err := memdb.NewMemDB(schema) if err != nil { - panic(err) + panic(err) } // Create a write transaction txn := db.Txn(true) -// Insert a new person -p := &Person{"joe@aol.com", "Joe", 30} -if err := txn.Insert("person", p); err != nil { - panic(err) +// Insert some people +people := []*Person{ + &Person{"joe@aol.com", "Joe", 30}, + &Person{"lucy@aol.com", "Lucy", 35}, + &Person{"tariq@aol.com", "Tariq", 21}, + &Person{"dorothy@aol.com", "Dorothy", 53}, +} +for _, p := range people { + if err := txn.Insert("person", p); err != nil { + panic(err) + } } // Commit the transaction @@ -83,11 +100,47 @@ defer txn.Abort() // Lookup by email raw, err := txn.First("person", "id", "joe@aol.com") if err != nil { - panic(err) + panic(err) } // Say hi! -fmt.Printf("Hello %s!", raw.(*Person).Name) +fmt.Printf("Hello %s!\n", raw.(*Person).Name) +// List all the people +it, err := txn.Get("person", "id") +if err != nil { + panic(err) +} + +fmt.Println("All the people:") +for obj := it.Next(); obj != nil; obj = it.Next() { + p := obj.(*Person) + fmt.Printf(" %s\n", p.Name) +} + +// Range scan over people with ages between 25 and 35 inclusive +it, err = txn.LowerBound("person", "age", 25) +if err != nil { + panic(err) +} + +fmt.Println("People aged 25 - 35:") +for obj := it.Next(); obj != nil; obj = it.Next() { + p := obj.(*Person) + if p.Age > 35 { + break + } + fmt.Printf(" %s is aged %d\n", p.Name, p.Age) +} +// Output: +// Hello Joe! +// All the people: +// Dorothy +// Joe +// Lucy +// Tariq +// People aged 25 - 35: +// Joe is aged 30 +// Lucy is aged 35 ``` diff --git a/vendor/github.com/hashicorp/go-memdb/changes.go b/vendor/github.com/hashicorp/go-memdb/changes.go new file mode 100644 index 0000000000..35089f5ce7 --- /dev/null +++ b/vendor/github.com/hashicorp/go-memdb/changes.go @@ -0,0 +1,34 @@ +package memdb + +// Changes describes a set of mutations to memDB tables performed during a +// transaction. +type Changes []Change + +// Change describes a mutation to an object in a table. +type Change struct { + Table string + Before interface{} + After interface{} + + // primaryKey stores the raw key value from the primary index so that we can + // de-duplicate multiple updates of the same object in the same transaction + // but we don't expose this implementation detail to the consumer. + primaryKey []byte +} + +// Created returns true if the mutation describes a new object being inserted. +func (m *Change) Created() bool { + return m.Before == nil && m.After != nil +} + +// Updated returns true if the mutation describes an existing object being +// updated. +func (m *Change) Updated() bool { + return m.Before != nil && m.After != nil +} + +// Deleted returns true if the mutation describes an existing object being +// deleted. +func (m *Change) Deleted() bool { + return m.Before != nil && m.After == nil +} diff --git a/vendor/github.com/hashicorp/go-memdb/filter.go b/vendor/github.com/hashicorp/go-memdb/filter.go new file mode 100644 index 0000000000..0071ab311a --- /dev/null +++ b/vendor/github.com/hashicorp/go-memdb/filter.go @@ -0,0 +1,38 @@ +package memdb + +// FilterFunc is a function that takes the results of an iterator and returns +// whether the result should be filtered out. +type FilterFunc func(interface{}) bool + +// FilterIterator is used to wrap a ResultIterator and apply a filter over it. +type FilterIterator struct { + // filter is the filter function applied over the base iterator. + filter FilterFunc + + // iter is the iterator that is being wrapped. + iter ResultIterator +} + +// NewFilterIterator wraps a ResultIterator. The filter function is applied +// to each value returned by a call to iter.Next. +// +// See the documentation for ResultIterator to understand the behaviour of the +// returned FilterIterator. +func NewFilterIterator(iter ResultIterator, filter FilterFunc) *FilterIterator { + return &FilterIterator{ + filter: filter, + iter: iter, + } +} + +// WatchCh returns the watch channel of the wrapped iterator. +func (f *FilterIterator) WatchCh() <-chan struct{} { return f.iter.WatchCh() } + +// Next returns the next non-filtered result from the wrapped iterator. +func (f *FilterIterator) Next() interface{} { + for { + if value := f.iter.Next(); value == nil || !f.filter(value) { + return value + } + } +} diff --git a/vendor/github.com/hashicorp/go-memdb/index.go b/vendor/github.com/hashicorp/go-memdb/index.go index 9f4c7d69e0..3b87d94f67 100644 --- a/vendor/github.com/hashicorp/go-memdb/index.go +++ b/vendor/github.com/hashicorp/go-memdb/index.go @@ -1,41 +1,55 @@ package memdb import ( + "encoding/binary" "encoding/hex" + "errors" "fmt" + "math/bits" "reflect" "strings" ) -// Indexer is an interface used for defining indexes +// Indexer is an interface used for defining indexes. Indexes are used +// for efficient lookup of objects in a MemDB table. An Indexer must also +// implement one of SingleIndexer or MultiIndexer. +// +// Indexers are primarily responsible for returning the lookup key as +// a byte slice. The byte slice is the key data in the underlying data storage. type Indexer interface { - // ExactFromArgs is used to build an exact index lookup - // based on arguments + // FromArgs is called to build the exact index key from a list of arguments. FromArgs(args ...interface{}) ([]byte, error) } -// SingleIndexer is an interface used for defining indexes -// generating a single entry per object +// SingleIndexer is an interface used for defining indexes that generate a +// single value per object type SingleIndexer interface { - // FromObject is used to extract an index value from an - // object or to indicate that the index value is missing. + // FromObject extracts the index value from an object. The return values + // are whether the index value was found, the index value, and any error + // while extracting the index value, respectively. FromObject(raw interface{}) (bool, []byte, error) } -// MultiIndexer is an interface used for defining indexes -// generating multiple entries per object +// MultiIndexer is an interface used for defining indexes that generate +// multiple values per object. Each value is stored as a seperate index +// pointing to the same object. +// +// For example, an index that extracts the first and last name of a person +// and allows lookup based on eitherd would be a MultiIndexer. The FromObject +// of this example would split the first and last name and return both as +// values. type MultiIndexer interface { - // FromObject is used to extract index values from an - // object or to indicate that the index value is missing. + // FromObject extracts index values from an object. The return values + // are the same as a SingleIndexer except there can be multiple index + // values. FromObject(raw interface{}) (bool, [][]byte, error) } -// PrefixIndexer can optionally be implemented for any -// indexes that support prefix based iteration. This may -// not apply to all indexes. +// PrefixIndexer is an optional interface on top of an Indexer that allows +// indexes to support prefix-based iteration. type PrefixIndexer interface { - // PrefixFromArgs returns a prefix that should be used - // for scanning based on the arguments + // PrefixFromArgs is the same as FromArgs for an Indexer except that + // the index value returned should return all prefix-matched values. PrefixFromArgs(args ...interface{}) ([]byte, error) } @@ -51,9 +65,16 @@ func (s *StringFieldIndex) FromObject(obj interface{}) (bool, []byte, error) { v = reflect.Indirect(v) // Dereference the pointer if any fv := v.FieldByName(s.Field) - if !fv.IsValid() { + isPtr := fv.Kind() == reflect.Ptr + fv = reflect.Indirect(fv) + if !isPtr && !fv.IsValid() { return false, nil, - fmt.Errorf("field '%s' for %#v is invalid", s.Field, obj) + fmt.Errorf("field '%s' for %#v is invalid %v ", s.Field, obj, isPtr) + } + + if isPtr && !fv.IsValid() { + val := "" + return false, []byte(val), nil } val := fv.String() @@ -100,8 +121,9 @@ func (s *StringFieldIndex) PrefixFromArgs(args ...interface{}) ([]byte, error) { return val, nil } -// StringSliceFieldIndex is used to extract a field from an object -// using reflection and builds an index on that field. +// StringSliceFieldIndex builds an index from a field on an object that is a +// string slice ([]string). Each value within the string slice can be used for +// lookup. type StringSliceFieldIndex struct { Field string Lowercase bool @@ -173,6 +195,290 @@ func (s *StringSliceFieldIndex) PrefixFromArgs(args ...interface{}) ([]byte, err return val, nil } +// StringMapFieldIndex is used to extract a field of type map[string]string +// from an object using reflection and builds an index on that field. +// +// Note that although FromArgs in theory supports using either one or +// two arguments, there is a bug: FromObject only creates an index +// using key/value, and does not also create an index using key. This +// means a lookup using one argument will never actually work. +// +// It is currently left as-is to prevent backwards compatibility +// issues. +// +// TODO: Fix this in the next major bump. +type StringMapFieldIndex struct { + Field string + Lowercase bool +} + +var MapType = reflect.MapOf(reflect.TypeOf(""), reflect.TypeOf("")).Kind() + +func (s *StringMapFieldIndex) FromObject(obj interface{}) (bool, [][]byte, error) { + v := reflect.ValueOf(obj) + v = reflect.Indirect(v) // Dereference the pointer if any + + fv := v.FieldByName(s.Field) + if !fv.IsValid() { + return false, nil, fmt.Errorf("field '%s' for %#v is invalid", s.Field, obj) + } + + if fv.Kind() != MapType { + return false, nil, fmt.Errorf("field '%s' is not a map[string]string", s.Field) + } + + length := fv.Len() + vals := make([][]byte, 0, length) + for _, key := range fv.MapKeys() { + k := key.String() + if k == "" { + continue + } + val := fv.MapIndex(key).String() + + if s.Lowercase { + k = strings.ToLower(k) + val = strings.ToLower(val) + } + + // Add the null character as a terminator + k += "\x00" + val + "\x00" + + vals = append(vals, []byte(k)) + } + if len(vals) == 0 { + return false, nil, nil + } + return true, vals, nil +} + +// WARNING: Because of a bug in FromObject, this function will never return +// a value when using the single-argument version. +func (s *StringMapFieldIndex) FromArgs(args ...interface{}) ([]byte, error) { + if len(args) > 2 || len(args) == 0 { + return nil, fmt.Errorf("must provide one or two arguments") + } + key, ok := args[0].(string) + if !ok { + return nil, fmt.Errorf("argument must be a string: %#v", args[0]) + } + if s.Lowercase { + key = strings.ToLower(key) + } + // Add the null character as a terminator + key += "\x00" + + if len(args) == 2 { + val, ok := args[1].(string) + if !ok { + return nil, fmt.Errorf("argument must be a string: %#v", args[1]) + } + if s.Lowercase { + val = strings.ToLower(val) + } + // Add the null character as a terminator + key += val + "\x00" + } + + return []byte(key), nil +} + +// IntFieldIndex is used to extract an int field from an object using +// reflection and builds an index on that field. +type IntFieldIndex struct { + Field string +} + +func (i *IntFieldIndex) FromObject(obj interface{}) (bool, []byte, error) { + v := reflect.ValueOf(obj) + v = reflect.Indirect(v) // Dereference the pointer if any + + fv := v.FieldByName(i.Field) + if !fv.IsValid() { + return false, nil, + fmt.Errorf("field '%s' for %#v is invalid", i.Field, obj) + } + + // Check the type + k := fv.Kind() + size, ok := IsIntType(k) + if !ok { + return false, nil, fmt.Errorf("field %q is of type %v; want an int", i.Field, k) + } + + // Get the value and encode it + val := fv.Int() + buf := make([]byte, size) + binary.PutVarint(buf, val) + + return true, buf, nil +} + +func (i *IntFieldIndex) FromArgs(args ...interface{}) ([]byte, error) { + if len(args) != 1 { + return nil, fmt.Errorf("must provide only a single argument") + } + + v := reflect.ValueOf(args[0]) + if !v.IsValid() { + return nil, fmt.Errorf("%#v is invalid", args[0]) + } + + k := v.Kind() + size, ok := IsIntType(k) + if !ok { + return nil, fmt.Errorf("arg is of type %v; want a int", k) + } + + val := v.Int() + buf := make([]byte, size) + binary.PutVarint(buf, val) + + return buf, nil +} + +// IsIntType returns whether the passed type is a type of int and the number +// of bytes needed to encode the type. +func IsIntType(k reflect.Kind) (size int, okay bool) { + switch k { + case reflect.Int: + return binary.MaxVarintLen64, true + case reflect.Int8: + return 2, true + case reflect.Int16: + return binary.MaxVarintLen16, true + case reflect.Int32: + return binary.MaxVarintLen32, true + case reflect.Int64: + return binary.MaxVarintLen64, true + default: + return 0, false + } +} + +// UintFieldIndex is used to extract a uint field from an object using +// reflection and builds an index on that field. +type UintFieldIndex struct { + Field string +} + +func (u *UintFieldIndex) FromObject(obj interface{}) (bool, []byte, error) { + v := reflect.ValueOf(obj) + v = reflect.Indirect(v) // Dereference the pointer if any + + fv := v.FieldByName(u.Field) + if !fv.IsValid() { + return false, nil, + fmt.Errorf("field '%s' for %#v is invalid", u.Field, obj) + } + + // Check the type + k := fv.Kind() + size, ok := IsUintType(k) + if !ok { + return false, nil, fmt.Errorf("field %q is of type %v; want a uint", u.Field, k) + } + + // Get the value and encode it + val := fv.Uint() + buf := encodeUInt(val, size) + + return true, buf, nil +} + +func (u *UintFieldIndex) FromArgs(args ...interface{}) ([]byte, error) { + if len(args) != 1 { + return nil, fmt.Errorf("must provide only a single argument") + } + + v := reflect.ValueOf(args[0]) + if !v.IsValid() { + return nil, fmt.Errorf("%#v is invalid", args[0]) + } + + k := v.Kind() + size, ok := IsUintType(k) + if !ok { + return nil, fmt.Errorf("arg is of type %v; want a uint", k) + } + + val := v.Uint() + buf := encodeUInt(val, size) + + return buf, nil +} + +func encodeUInt(val uint64, size int) []byte { + buf := make([]byte, size) + + switch size { + case 1: + buf[0] = uint8(val) + case 2: + binary.BigEndian.PutUint16(buf, uint16(val)) + case 4: + binary.BigEndian.PutUint32(buf, uint32(val)) + case 8: + binary.BigEndian.PutUint64(buf, val) + } + + return buf +} + +// IsUintType returns whether the passed type is a type of uint and the number +// of bytes needed to encode the type. +func IsUintType(k reflect.Kind) (size int, okay bool) { + switch k { + case reflect.Uint: + return bits.UintSize / 8, true + case reflect.Uint8: + return 1, true + case reflect.Uint16: + return 2, true + case reflect.Uint32: + return 4, true + case reflect.Uint64: + return 8, true + default: + return 0, false + } +} + +// BoolFieldIndex is used to extract an boolean field from an object using +// reflection and builds an index on that field. +type BoolFieldIndex struct { + Field string +} + +func (i *BoolFieldIndex) FromObject(obj interface{}) (bool, []byte, error) { + v := reflect.ValueOf(obj) + v = reflect.Indirect(v) // Dereference the pointer if any + + fv := v.FieldByName(i.Field) + if !fv.IsValid() { + return false, nil, + fmt.Errorf("field '%s' for %#v is invalid", i.Field, obj) + } + + // Check the type + k := fv.Kind() + if k != reflect.Bool { + return false, nil, fmt.Errorf("field %q is of type %v; want a bool", i.Field, k) + } + + // Get the value and encode it + buf := make([]byte, 1) + if fv.Bool() { + buf[0] = 1 + } + + return true, buf, nil +} + +func (i *BoolFieldIndex) FromArgs(args ...interface{}) ([]byte, error) { + return fromBoolArgs(args) +} + // UUIDFieldIndex is used to extract a field from an object // using reflection and builds an index on that field by treating // it as a UUID. This is an optimization to using a StringFieldIndex @@ -378,7 +684,7 @@ func (c *CompoundIndex) FromObject(raw interface{}) (bool, []byte, error) { func (c *CompoundIndex) FromArgs(args ...interface{}) ([]byte, error) { if len(args) != len(c.Indexes) { - return nil, fmt.Errorf("less arguments than index fields") + return nil, fmt.Errorf("non-equivalent argument count and index fields") } var out []byte for i, arg := range args { @@ -417,3 +723,177 @@ func (c *CompoundIndex) PrefixFromArgs(args ...interface{}) ([]byte, error) { } return out, nil } + +// CompoundMultiIndex is used to build an index using multiple +// sub-indexes. +// +// Unlike CompoundIndex, CompoundMultiIndex can have both +// SingleIndexer and MultiIndexer sub-indexers. However, each +// MultiIndexer adds considerable overhead/complexity in terms of +// the number of indexes created under-the-hood. It is not suggested +// to use more than one or two, if possible. +// +// Another change from CompoundIndexer is that if AllowMissing is +// set, not only is it valid to have empty index fields, but it will +// still create index values up to the first empty index. This means +// that if you have a value with an empty field, rather than using a +// prefix for lookup, you can simply pass in less arguments. As an +// example, if {Foo, Bar} is indexed but Bar is missing for a value +// and AllowMissing is set, an index will still be created for {Foo} +// and it is valid to do a lookup passing in only Foo as an argument. +// Note that the ordering isn't guaranteed -- it's last-insert wins, +// but this is true if you have two objects that have the same +// indexes not using AllowMissing anyways. +// +// Because StringMapFieldIndexers can take a varying number of args, +// it is currently a requirement that whenever it is used, two +// arguments must _always_ be provided for it. In theory we only +// need one, except a bug in that indexer means the single-argument +// version will never work. You can leave the second argument nil, +// but it will never produce a value. We support this for whenever +// that bug is fixed, likely in a next major version bump. +// +// Prefix-based indexing is not currently supported. +type CompoundMultiIndex struct { + Indexes []Indexer + + // AllowMissing results in an index based on only the indexers + // that return data. If true, you may end up with 2/3 columns + // indexed which might be useful for an index scan. Otherwise, + // CompoundMultiIndex requires all indexers to be satisfied. + AllowMissing bool +} + +func (c *CompoundMultiIndex) FromObject(raw interface{}) (bool, [][]byte, error) { + // At each entry, builder is storing the results from the next index + builder := make([][][]byte, 0, len(c.Indexes)) + // Start with something higher to avoid resizing if possible + out := make([][]byte, 0, len(c.Indexes)^3) + +forloop: + // This loop goes through each indexer and adds the value(s) provided to the next + // entry in the slice. We can then later walk it like a tree to construct the indices. + for i, idxRaw := range c.Indexes { + switch idx := idxRaw.(type) { + case SingleIndexer: + ok, val, err := idx.FromObject(raw) + if err != nil { + return false, nil, fmt.Errorf("single sub-index %d error: %v", i, err) + } + if !ok { + if c.AllowMissing { + break forloop + } else { + return false, nil, nil + } + } + builder = append(builder, [][]byte{val}) + + case MultiIndexer: + ok, vals, err := idx.FromObject(raw) + if err != nil { + return false, nil, fmt.Errorf("multi sub-index %d error: %v", i, err) + } + if !ok { + if c.AllowMissing { + break forloop + } else { + return false, nil, nil + } + } + + // Add each of the new values to each of the old values + builder = append(builder, vals) + + default: + return false, nil, fmt.Errorf("sub-index %d does not satisfy either SingleIndexer or MultiIndexer", i) + } + } + + // We are walking through the builder slice essentially in a depth-first fashion, + // building the prefix and leaves as we go. If AllowMissing is false, we only insert + // these full paths to leaves. Otherwise, we also insert each prefix along the way. + // This allows for lookup in FromArgs when AllowMissing is true that does not contain + // the full set of arguments. e.g. for {Foo, Bar} where an object has only the Foo + // field specified as "abc", it is valid to call FromArgs with just "abc". + var walkVals func([]byte, int) + walkVals = func(currPrefix []byte, depth int) { + if depth == len(builder)-1 { + // These are the "leaves", so append directly + for _, v := range builder[depth] { + out = append(out, append(currPrefix, v...)) + } + return + } + for _, v := range builder[depth] { + nextPrefix := append(currPrefix, v...) + if c.AllowMissing { + out = append(out, nextPrefix) + } + walkVals(nextPrefix, depth+1) + } + } + + walkVals(nil, 0) + + return true, out, nil +} + +func (c *CompoundMultiIndex) FromArgs(args ...interface{}) ([]byte, error) { + var stringMapCount int + var argCount int + for _, index := range c.Indexes { + if argCount >= len(args) { + break + } + if _, ok := index.(*StringMapFieldIndex); ok { + // We require pairs for StringMapFieldIndex, but only got one + if argCount+1 >= len(args) { + return nil, errors.New("invalid number of arguments") + } + stringMapCount++ + argCount += 2 + } else { + argCount++ + } + } + argCount = 0 + + switch c.AllowMissing { + case true: + if len(args) > len(c.Indexes)+stringMapCount { + return nil, errors.New("too many arguments") + } + + default: + if len(args) != len(c.Indexes)+stringMapCount { + return nil, errors.New("number of arguments does not equal number of indexers") + } + } + + var out []byte + var val []byte + var err error + for i, idx := range c.Indexes { + if argCount >= len(args) { + // We're done; should only hit this if AllowMissing + break + } + if _, ok := idx.(*StringMapFieldIndex); ok { + if args[argCount+1] == nil { + val, err = idx.FromArgs(args[argCount]) + } else { + val, err = idx.FromArgs(args[argCount : argCount+2]...) + } + argCount += 2 + } else { + val, err = idx.FromArgs(args[argCount]) + argCount++ + } + if err != nil { + return nil, fmt.Errorf("sub-index %d error: %v", i, err) + } + out = append(out, val...) + } + return out, nil +} diff --git a/vendor/github.com/hashicorp/go-memdb/memdb.go b/vendor/github.com/hashicorp/go-memdb/memdb.go index 1d708517db..25f6bc8925 100644 --- a/vendor/github.com/hashicorp/go-memdb/memdb.go +++ b/vendor/github.com/hashicorp/go-memdb/memdb.go @@ -1,3 +1,5 @@ +// Package memdb provides an in-memory database that supports transactions +// and MVCC. package memdb import ( @@ -8,19 +10,29 @@ import ( "github.com/hashicorp/go-immutable-radix" ) -// MemDB is an in-memory database. It provides a table abstraction, -// which is used to store objects (rows) with multiple indexes based -// on values. The database makes use of immutable radix trees to provide -// transactions and MVCC. +// MemDB is an in-memory database providing Atomicity, Consistency, and +// Isolation from ACID. MemDB doesn't provide Durability since it is an +// in-memory database. +// +// MemDB provides a table abstraction to store objects (rows) with multiple +// indexes based on inserted values. The database makes use of immutable radix +// trees to provide transactions and MVCC. +// +// Objects inserted into MemDB are not copied. It is **extremely important** +// that objects are not modified in-place after they are inserted since they +// are stored directly in MemDB. It remains unsafe to modify inserted objects +// even after they've been deleted from MemDB since there may still be older +// snapshots of the DB being read from other goroutines. type MemDB struct { - schema *DBSchema - root unsafe.Pointer // *iradix.Tree underneath + schema *DBSchema + root unsafe.Pointer // *iradix.Tree underneath + primary bool - // There can only be a single writter at once + // There can only be a single writer at once writer sync.Mutex } -// NewMemDB creates a new MemDB with the given schema +// NewMemDB creates a new MemDB with the given schema. func NewMemDB(schema *DBSchema) (*MemDB, error) { // Validate the schema if err := schema.Validate(); err != nil { @@ -29,12 +41,14 @@ func NewMemDB(schema *DBSchema) (*MemDB, error) { // Create the MemDB db := &MemDB{ - schema: schema, - root: unsafe.Pointer(iradix.New()), + schema: schema, + root: unsafe.Pointer(iradix.New()), + primary: true, } if err := db.initialize(); err != nil { return nil, err } + return db, nil } @@ -44,7 +58,7 @@ func (db *MemDB) getRoot() *iradix.Tree { return root } -// Txn is used to start a new transaction, in either read or write mode. +// Txn is used to start a new transaction in either read or write mode. // There can only be a single concurrent writer, but any number of readers. func (db *MemDB) Txn(write bool) *Txn { if write { @@ -58,22 +72,27 @@ func (db *MemDB) Txn(write bool) *Txn { return txn } -// Snapshot is used to capture a point-in-time snapshot -// of the database that will not be affected by any write -// operations to the existing DB. +// Snapshot is used to capture a point-in-time snapshot of the database that +// will not be affected by any write operations to the existing DB. +// +// If MemDB is storing reference-based values (pointers, maps, slices, etc.), +// the Snapshot will not deep copy those values. Therefore, it is still unsafe +// to modify any inserted values in either DB. func (db *MemDB) Snapshot() *MemDB { clone := &MemDB{ - schema: db.schema, - root: unsafe.Pointer(db.getRoot()), + schema: db.schema, + root: unsafe.Pointer(db.getRoot()), + primary: false, } return clone } -// initialize is used to setup the DB for use after creation +// initialize is used to setup the DB for use after creation. This should +// be called only once after allocating a MemDB. func (db *MemDB) initialize() error { root := db.getRoot() for tName, tableSchema := range db.schema.Tables { - for iName, _ := range tableSchema.Indexes { + for iName := range tableSchema.Indexes { index := iradix.New() path := indexPath(tName, iName) root, _, _ = root.Insert(path, index) diff --git a/vendor/github.com/hashicorp/go-memdb/schema.go b/vendor/github.com/hashicorp/go-memdb/schema.go index 26d0fcb99f..e6a9b526bc 100644 --- a/vendor/github.com/hashicorp/go-memdb/schema.go +++ b/vendor/github.com/hashicorp/go-memdb/schema.go @@ -2,33 +2,47 @@ package memdb import "fmt" -// DBSchema contains the full database schema used for MemDB +// DBSchema is the schema to use for the full database with a MemDB instance. +// +// MemDB will require a valid schema. Schema validation can be tested using +// the Validate function. Calling this function is recommended in unit tests. type DBSchema struct { + // Tables is the set of tables within this database. The key is the + // table name and must match the Name in TableSchema. Tables map[string]*TableSchema } -// Validate is used to validate the database schema +// Validate validates the schema. func (s *DBSchema) Validate() error { if s == nil { - return fmt.Errorf("missing schema") + return fmt.Errorf("schema is nil") } + if len(s.Tables) == 0 { - return fmt.Errorf("no tables defined") + return fmt.Errorf("schema has no tables defined") } + for name, table := range s.Tables { if name != table.Name { return fmt.Errorf("table name mis-match for '%s'", name) } + if err := table.Validate(); err != nil { - return err + return fmt.Errorf("table %q: %s", name, err) } } + return nil } -// TableSchema contains the schema for a single table +// TableSchema is the schema for a single table. type TableSchema struct { - Name string + // Name of the table. This must match the key in the Tables map in DBSchema. + Name string + + // Indexes is the set of indexes for querying this table. The key + // is a unique name for the index and must match the Name in the + // IndexSchema. Indexes map[string]*IndexSchema } @@ -37,35 +51,50 @@ func (s *TableSchema) Validate() error { if s.Name == "" { return fmt.Errorf("missing table name") } + if len(s.Indexes) == 0 { - return fmt.Errorf("missing table schemas for '%s'", s.Name) + return fmt.Errorf("missing table indexes for '%s'", s.Name) } + if _, ok := s.Indexes["id"]; !ok { return fmt.Errorf("must have id index") } + if !s.Indexes["id"].Unique { return fmt.Errorf("id index must be unique") } + if _, ok := s.Indexes["id"].Indexer.(SingleIndexer); !ok { return fmt.Errorf("id index must be a SingleIndexer") } + for name, index := range s.Indexes { if name != index.Name { return fmt.Errorf("index name mis-match for '%s'", name) } + if err := index.Validate(); err != nil { - return err + return fmt.Errorf("index %q: %s", name, err) } } + return nil } -// IndexSchema contains the schema for an index +// IndexSchema is the schema for an index. An index defines how a table is +// queried. type IndexSchema struct { - Name string + // Name of the index. This must be unique among a tables set of indexes. + // This must match the key in the map of Indexes for a TableSchema. + Name string + + // AllowMissing if true ignores this index if it doesn't produce a + // value. For example, an index that extracts a field that doesn't + // exist from a structure. AllowMissing bool - Unique bool - Indexer Indexer + + Unique bool + Indexer Indexer } func (s *IndexSchema) Validate() error { diff --git a/vendor/github.com/hashicorp/go-memdb/txn.go b/vendor/github.com/hashicorp/go-memdb/txn.go index fa73c9a3f1..1a9da1a710 100644 --- a/vendor/github.com/hashicorp/go-memdb/txn.go +++ b/vendor/github.com/hashicorp/go-memdb/txn.go @@ -7,13 +7,18 @@ import ( "sync/atomic" "unsafe" - "github.com/hashicorp/go-immutable-radix" + iradix "github.com/hashicorp/go-immutable-radix" ) const ( id = "id" ) +var ( + // ErrNotFound is returned when the requested item is not found + ErrNotFound = fmt.Errorf("not found") +) + // tableIndex is a tuple of (Table, Index) used for lookups type tableIndex struct { Table string @@ -28,19 +33,35 @@ type Txn struct { rootTxn *iradix.Txn after []func() + // changes is used to track the changes performed during the transaction. If + // it is nil at transaction start then changes are not tracked. + changes Changes + modified map[tableIndex]*iradix.Txn } -// readableIndex returns a transaction usable for reading the given -// index in a table. If a write transaction is in progress, we may need -// to use an existing modified txn. +// TrackChanges enables change tracking for the transaction. If called at any +// point before commit, subsequent mutations will be recorded and can be +// retrieved using ChangeSet. Once this has been called on a transaction it +// can't be unset. As with other Txn methods it's not safe to call this from a +// different goroutine than the one making mutations or committing the +// transaction. +func (txn *Txn) TrackChanges() { + if txn.changes == nil { + txn.changes = make(Changes, 0, 1) + } +} + +// readableIndex returns a transaction usable for reading the given index in a +// table. If the transaction is a write transaction with modifications, a clone of the +// modified index will be returned. func (txn *Txn) readableIndex(table, index string) *iradix.Txn { // Look for existing transaction if txn.write && txn.modified != nil { key := tableIndex{table, index} exist, ok := txn.modified[key] if ok { - return exist + return exist.Clone() } } @@ -70,6 +91,11 @@ func (txn *Txn) writableIndex(table, index string) *iradix.Txn { raw, _ := txn.rootTxn.Get(path) indexTxn := raw.(*iradix.Tree).Txn() + // If we are the primary DB, enable mutation tracking. Snapshots should + // not notify, otherwise we will trigger watches on the primary DB when + // the writes will not be visible. + indexTxn.TrackMutate(txn.db.primary) + // Keep this open for the duration of the txn txn.modified[key] = indexTxn return indexTxn @@ -91,6 +117,7 @@ func (txn *Txn) Abort() { // Clear the txn txn.rootTxn = nil txn.modified = nil + txn.changes = nil // Release the writer lock since this is invalid txn.db.writer.Unlock() @@ -112,14 +139,23 @@ func (txn *Txn) Commit() { // Commit each sub-transaction scoped to (table, index) for key, subTxn := range txn.modified { path := indexPath(key.Table, key.Index) - final := subTxn.Commit() + final := subTxn.CommitOnly() txn.rootTxn.Insert(path, final) } // Update the root of the DB - newRoot := txn.rootTxn.Commit() + newRoot := txn.rootTxn.CommitOnly() atomic.StorePointer(&txn.db.root, unsafe.Pointer(newRoot)) + // Now issue all of the mutation updates (this is safe to call + // even if mutation tracking isn't enabled); we do this after + // the root pointer is swapped so that waking responders will + // see the new state. + for _, subTxn := range txn.modified { + subTxn.Notify() + } + txn.rootTxn.Notify() + // Clear the txn txn.rootTxn = nil txn.modified = nil @@ -134,7 +170,11 @@ func (txn *Txn) Commit() { } } -// Insert is used to add or update an object into the given table +// Insert is used to add or update an object into the given table. +// +// When updating an object, the obj provided should be a copy rather +// than a value updated in-place. Modifying values in-place that are already +// inserted into MemDB is not supported behavior. func (txn *Txn) Insert(table string, obj interface{}) error { if !txn.write { return fmt.Errorf("cannot insert in read-only transaction") @@ -246,11 +286,19 @@ func (txn *Txn) Insert(table string, obj interface{}) error { indexTxn.Insert(val, obj) } } + if txn.changes != nil { + txn.changes = append(txn.changes, Change{ + Table: table, + Before: existing, // might be nil on a create + After: obj, + primaryKey: idVal, + }) + } return nil } -// Delete is used to delete a single object from the given table -// This object must already exist in the table +// Delete is used to delete a single object from the given table. +// This object must already exist in the table. func (txn *Txn) Delete(table string, obj interface{}) error { if !txn.write { return fmt.Errorf("cannot delete in read-only transaction") @@ -277,7 +325,7 @@ func (txn *Txn) Delete(table string, obj interface{}) error { idTxn := txn.writableIndex(table, id) existing, ok := idTxn.Get(idVal) if !ok { - return fmt.Errorf("not found") + return ErrNotFound } // Remove the object from all the indexes @@ -313,9 +361,121 @@ func (txn *Txn) Delete(table string, obj interface{}) error { } } } + if txn.changes != nil { + txn.changes = append(txn.changes, Change{ + Table: table, + Before: existing, + After: nil, // Now nil indicates deletion + primaryKey: idVal, + }) + } return nil } +// DeletePrefix is used to delete an entire subtree based on a prefix. +// The given index must be a prefix index, and will be used to perform a scan and enumerate the set of objects to delete. +// These will be removed from all other indexes, and then a special prefix operation will delete the objects from the given index in an efficient subtree delete operation. +// This is useful when you have a very large number of objects indexed by the given index, along with a much smaller number of entries in the other indexes for those objects. +func (txn *Txn) DeletePrefix(table string, prefix_index string, prefix string) (bool, error) { + if !txn.write { + return false, fmt.Errorf("cannot delete in read-only transaction") + } + + if !strings.HasSuffix(prefix_index, "_prefix") { + return false, fmt.Errorf("Index name for DeletePrefix must be a prefix index, Got %v ", prefix_index) + } + + deletePrefixIndex := strings.TrimSuffix(prefix_index, "_prefix") + + // Get an iterator over all of the keys with the given prefix. + entries, err := txn.Get(table, prefix_index, prefix) + if err != nil { + return false, fmt.Errorf("failed kvs lookup: %s", err) + } + // Get the table schema + tableSchema, ok := txn.db.schema.Tables[table] + if !ok { + return false, fmt.Errorf("invalid table '%s'", table) + } + + foundAny := false + for entry := entries.Next(); entry != nil; entry = entries.Next() { + if !foundAny { + foundAny = true + } + // Get the primary ID of the object + idSchema := tableSchema.Indexes[id] + idIndexer := idSchema.Indexer.(SingleIndexer) + ok, idVal, err := idIndexer.FromObject(entry) + if err != nil { + return false, fmt.Errorf("failed to build primary index: %v", err) + } + if !ok { + return false, fmt.Errorf("object missing primary index") + } + if txn.changes != nil { + // Record the deletion + idTxn := txn.writableIndex(table, id) + existing, ok := idTxn.Get(idVal) + if ok { + txn.changes = append(txn.changes, Change{ + Table: table, + Before: existing, + After: nil, // Now nil indicates deletion + primaryKey: idVal, + }) + } + } + // Remove the object from all the indexes except the given prefix index + for name, indexSchema := range tableSchema.Indexes { + if name == deletePrefixIndex { + continue + } + indexTxn := txn.writableIndex(table, name) + + // Handle the update by deleting from the index first + var ( + ok bool + vals [][]byte + err error + ) + switch indexer := indexSchema.Indexer.(type) { + case SingleIndexer: + var val []byte + ok, val, err = indexer.FromObject(entry) + vals = [][]byte{val} + case MultiIndexer: + ok, vals, err = indexer.FromObject(entry) + } + if err != nil { + return false, fmt.Errorf("failed to build index '%s': %v", name, err) + } + + if ok { + // Handle non-unique index by computing a unique index. + // This is done by appending the primary key which must + // be unique anyways. + for _, val := range vals { + if !indexSchema.Unique { + val = append(val, idVal...) + } + indexTxn.Delete(val) + } + } + } + + } + if foundAny { + indexTxn := txn.writableIndex(table, deletePrefixIndex) + ok = indexTxn.DeletePrefix([]byte(prefix)) + if !ok { + panic(fmt.Errorf("prefix %v matched some entries but DeletePrefix did not delete any ", prefix)) + } + return true, nil + } + return false, nil +} + // DeleteAll is used to delete all the objects in a given table // matching the constraints on the index func (txn *Txn) DeleteAll(table, index string, args ...interface{}) (int, error) { @@ -352,13 +512,13 @@ func (txn *Txn) DeleteAll(table, index string, args ...interface{}) (int, error) return num, nil } -// First is used to return the first matching object for -// the given constraints on the index -func (txn *Txn) First(table, index string, args ...interface{}) (interface{}, error) { +// FirstWatch is used to return the first matching object for +// the given constraints on the index along with the watch channel +func (txn *Txn) FirstWatch(table, index string, args ...interface{}) (<-chan struct{}, interface{}, error) { // Get the index value indexSchema, val, err := txn.getIndexValue(table, index, args...) if err != nil { - return nil, err + return nil, nil, err } // Get the index itself @@ -366,18 +526,60 @@ func (txn *Txn) First(table, index string, args ...interface{}) (interface{}, er // Do an exact lookup if indexSchema.Unique && val != nil && indexSchema.Name == index { - obj, ok := indexTxn.Get(val) + watch, obj, ok := indexTxn.GetWatch(val) if !ok { - return nil, nil + return watch, nil, nil } - return obj, nil + return watch, obj, nil } // Handle non-unique index by using an iterator and getting the first value iter := indexTxn.Root().Iterator() - iter.SeekPrefix(val) + watch := iter.SeekPrefixWatch(val) _, value, _ := iter.Next() - return value, nil + return watch, value, nil +} + +// LastWatch is used to return the last matching object for +// the given constraints on the index along with the watch channel +func (txn *Txn) LastWatch(table, index string, args ...interface{}) (<-chan struct{}, interface{}, error) { + // Get the index value + indexSchema, val, err := txn.getIndexValue(table, index, args...) + if err != nil { + return nil, nil, err + } + + // Get the index itself + indexTxn := txn.readableIndex(table, indexSchema.Name) + + // Do an exact lookup + if indexSchema.Unique && val != nil && indexSchema.Name == index { + watch, obj, ok := indexTxn.GetWatch(val) + if !ok { + return watch, nil, nil + } + return watch, obj, nil + } + + // Handle non-unique index by using an iterator and getting the last value + iter := indexTxn.Root().ReverseIterator() + watch := iter.SeekPrefixWatch(val) + _, value, _ := iter.Previous() + return watch, value, nil +} + +// First is used to return the first matching object for +// the given constraints on the index +func (txn *Txn) First(table, index string, args ...interface{}) (interface{}, error) { + _, val, err := txn.FirstWatch(table, index, args...) + return val, err +} + +// Last is used to return the last matching object for +// the given constraints on the index +func (txn *Txn) Last(table, index string, args ...interface{}) (interface{}, error) { + _, val, err := txn.LastWatch(table, index, args...) + return val, err } // LongestPrefix is used to fetch the longest prefix match for the given @@ -465,19 +667,240 @@ func (txn *Txn) getIndexValue(table, index string, args ...interface{}) (*IndexS return indexSchema, val, err } -// ResultIterator is used to iterate over a list of results -// from a Get query on a table. +// ResultIterator is used to iterate over a list of results from a query on a table. +// +// When a ResultIterator is created from a write transaction, the results from +// Next will reflect a snapshot of the table at the time the ResultIterator is +// created. +// This means that calling Insert or Delete on a transaction while iterating is +// allowed, but the changes made by Insert or Delete will not be observed in the +// results returned from subsequent calls to Next. For example if an item is deleted +// from the index used by the iterator it will still be returned by Next. If an +// item is inserted into the index used by the iterator, it will not be returned +// by Next. However, an iterator created after a call to Insert or Delete will +// reflect the modifications. +// +// When a ResultIterator is created from a write transaction, and there are already +// modifications to the index used by the iterator, the modification cache of the +// index will be invalidated. This may result in some additional allocations if +// the same node in the index is modified again. type ResultIterator interface { + WatchCh() <-chan struct{} + // Next returns the next result from the iterator. If there are no more results + // nil is returned. Next() interface{} } -// Get is used to construct a ResultIterator over all the -// rows that match the given constraints of an index. +// Get is used to construct a ResultIterator over all the rows that match the +// given constraints of an index. The index values must match exactly (this +// is not a range-based or prefix-based lookup) by default. +// +// Prefix lookups: if the named index implements PrefixIndexer, you may perform +// prefix-based lookups by appending "_prefix" to the index name. In this +// scenario, the index values given in args are treated as prefix lookups. For +// example, a StringFieldIndex will match any string with the given value +// as a prefix: "mem" matches "memdb". +// +// See the documentation for ResultIterator to understand the behaviour of the +// returned ResultIterator. func (txn *Txn) Get(table, index string, args ...interface{}) (ResultIterator, error) { + indexIter, val, err := txn.getIndexIterator(table, index, args...) + if err != nil { + return nil, err + } + + // Seek the iterator to the appropriate sub-set + watchCh := indexIter.SeekPrefixWatch(val) + + // Create an iterator + iter := &radixIterator{ + iter: indexIter, + watchCh: watchCh, + } + return iter, nil +} + +// GetReverse is used to construct a Reverse ResultIterator over all the +// rows that match the given constraints of an index. +// The returned ResultIterator's Next() will return the next Previous value. +// +// See the documentation on Get for details on arguments. +// See the documentation for ResultIterator to understand the behaviour of the +// returned ResultIterator. +func (txn *Txn) GetReverse(table, index string, args ...interface{}) (ResultIterator, error) { + indexIter, val, err := txn.getIndexIteratorReverse(table, index, args...) + if err != nil { + return nil, err + } + + // Seek the iterator to the appropriate sub-set + watchCh := indexIter.SeekPrefixWatch(val) + + // Create an iterator + iter := &radixReverseIterator{ + iter: indexIter, + watchCh: watchCh, + } + return iter, nil +} + +// LowerBound is used to construct a ResultIterator over all the the range of +// rows that have an index value greater than or equal to the provide args. +// Calling this then iterating until the rows are larger than required allows +// range scans within an index. It is not possible to watch the resulting +// iterator since the radix tree doesn't efficiently allow watching on lower +// bound changes. The WatchCh returned will be nill and so will block forever. +// +// See the documentation for ResultIterator to understand the behaviour of the +// returned ResultIterator. +func (txn *Txn) LowerBound(table, index string, args ...interface{}) (ResultIterator, error) { + indexIter, val, err := txn.getIndexIterator(table, index, args...) + if err != nil { + return nil, err + } + + // Seek the iterator to the appropriate sub-set + indexIter.SeekLowerBound(val) + + // Create an iterator + iter := &radixIterator{ + iter: indexIter, + } + return iter, nil +} + +// ReverseLowerBound is used to construct a Reverse ResultIterator over all the +// the range of rows that have an index value less than or equal to the +// provide args. Calling this then iterating until the rows are lower than +// required allows range scans within an index. It is not possible to watch the +// resulting iterator since the radix tree doesn't efficiently allow watching +// on lower bound changes. The WatchCh returned will be nill and so will block +// forever. +// +// See the documentation for ResultIterator to understand the behaviour of the +// returned ResultIterator. +func (txn *Txn) ReverseLowerBound(table, index string, args ...interface{}) (ResultIterator, error) { + indexIter, val, err := txn.getIndexIteratorReverse(table, index, args...) + if err != nil { + return nil, err + } + + // Seek the iterator to the appropriate sub-set + indexIter.SeekReverseLowerBound(val) + + // Create an iterator + iter := &radixReverseIterator{ + iter: indexIter, + } + return iter, nil +} + +// objectID is a tuple of table name and the raw internal id byte slice +// converted to a string. It's only converted to a string to make it comparable +// so this struct can be used as a map index. +type objectID struct { + Table string + IndexVal string +} + +// mutInfo stores metadata about mutations to allow collapsing multiple +// mutations to the same object into one. +type mutInfo struct { + firstBefore interface{} + lastIdx int +} + +// Changes returns the set of object changes that have been made in the +// transaction so far. If change tracking is not enabled it wil always return +// nil. It can be called before or after Commit. If it is before Commit it will +// return all changes made so far which may not be the same as the final +// Changes. After abort it will always return nil. As with other Txn methods +// it's not safe to call this from a different goroutine than the one making +// mutations or committing the transaction. Mutations will appear in the order +// they were performed in the transaction but multiple operations to the same +// object will be collapsed so only the effective overall change to that object +// is present. If transaction operations are dependent (e.g. copy object X to Y +// then delete X) this might mean the set of mutations is incomplete to verify +// history, but it is complete in that the net effect is preserved (Y got a new +// value, X got removed). +func (txn *Txn) Changes() Changes { + if txn.changes == nil { + return nil + } + + // De-duplicate mutations by key so all take effect at the point of the last + // write but we keep the mutations in order. + dups := make(map[objectID]mutInfo) + for i, m := range txn.changes { + oid := objectID{ + Table: m.Table, + IndexVal: string(m.primaryKey), + } + // Store the latest mutation index for each key value + mi, ok := dups[oid] + if !ok { + // First entry for key, store the before value + mi.firstBefore = m.Before + } + mi.lastIdx = i + dups[oid] = mi + } + if len(dups) == len(txn.changes) { + // No duplicates found, fast path return it as is + return txn.changes + } + + // Need to remove the duplicates + cs := make(Changes, 0, len(dups)) + for i, m := range txn.changes { + oid := objectID{ + Table: m.Table, + IndexVal: string(m.primaryKey), + } + mi := dups[oid] + if mi.lastIdx == i { + // This was the latest value for this key copy it with the before value in + // case it's different. Note that m is not a pointer so we are not + // modifying the txn.changeSet here - it's already a copy. + m.Before = mi.firstBefore + + // Edge case - if the object was inserted and then eventually deleted in + // the same transaction, then the net affect on that key is a no-op. Don't + // emit a mutation with nil for before and after as it's meaningless and + // might violate expectations and cause a panic in code that assumes at + // least one must be set. + if m.Before == nil && m.After == nil { + continue + } + cs = append(cs, m) + } + } + // Store the de-duped version in case this is called again + txn.changes = cs + return cs +} + +func (txn *Txn) getIndexIterator(table, index string, args ...interface{}) (*iradix.Iterator, []byte, error) { // Get the index value to scan indexSchema, val, err := txn.getIndexValue(table, index, args...) if err != nil { - return nil, err + return nil, nil, err + } + + // Get the index itself + indexTxn := txn.readableIndex(table, indexSchema.Name) + indexRoot := indexTxn.Root() + + // Get an iterator over the index + indexIter := indexRoot.Iterator() + return indexIter, val, nil +} + +func (txn *Txn) getIndexIteratorReverse(table, index string, args ...interface{}) (*iradix.ReverseIterator, []byte, error) { + // Get the index value to scan + indexSchema, val, err := txn.getIndexValue(table, index, args...) + if err != nil { + return nil, nil, err } // Get the index itself @@ -485,16 +908,8 @@ func (txn *Txn) Get(table, index string, args ...interface{}) (ResultIterator, e indexRoot := indexTxn.Root() // Get an interator over the index - indexIter := indexRoot.Iterator() - - // Seek the iterator to the appropriate sub-set - indexIter.SeekPrefix(val) - - // Create an iterator - iter := &radixIterator{ - iter: indexIter, - } - return iter, nil + indexIter := indexRoot.ReverseIterator() + return indexIter, val, nil } // Defer is used to push a new arbitrary function onto a stack which @@ -506,10 +921,15 @@ func (txn *Txn) Defer(fn func()) { } // radixIterator is used to wrap an underlying iradix iterator. -// This is much mroe efficient than a sliceIterator as we are not +// This is much more efficient than a sliceIterator as we are not // materializing the entire view. type radixIterator struct { - iter *iradix.Iterator + iter *iradix.Iterator + watchCh <-chan struct{} +} + +func (r *radixIterator) WatchCh() <-chan struct{} { + return r.watchCh } func (r *radixIterator) Next() interface{} { @@ -519,3 +939,43 @@ func (r *radixIterator) Next() interface{} { } return value } + +type radixReverseIterator struct { + iter *iradix.ReverseIterator + watchCh <-chan struct{} +} + +func (r *radixReverseIterator) Next() interface{} { + _, value, ok := r.iter.Previous() + if !ok { + return nil + } + return value +} + +func (r *radixReverseIterator) WatchCh() <-chan struct{} { + return r.watchCh +} + +// Snapshot creates a snapshot of the current state of the transaction. +// Returns a new read-only transaction or nil if the transaction is already +// aborted or committed. +func (txn *Txn) Snapshot() *Txn { + if txn.rootTxn == nil { + return nil + } + + snapshot := &Txn{ + db: txn.db, + rootTxn: txn.rootTxn.Clone(), + } + + // Commit sub-transactions into the snapshot + for key, subTxn := range txn.modified { + path := indexPath(key.Table, key.Index) + final := subTxn.CommitOnly() + snapshot.rootTxn.Insert(path, final) + } + + return snapshot +} diff --git a/vendor/github.com/hashicorp/go-memdb/watch.go b/vendor/github.com/hashicorp/go-memdb/watch.go new file mode 100644 index 0000000000..7de78a1298 --- /dev/null +++ b/vendor/github.com/hashicorp/go-memdb/watch.go @@ -0,0 +1,144 @@ +package memdb + +import ( + "context" + "time" +) + +// WatchSet is a collection of watch channels. +type WatchSet map[<-chan struct{}]struct{} + +// NewWatchSet constructs a new watch set. +func NewWatchSet() WatchSet { + return make(map[<-chan struct{}]struct{}) +} + +// Add appends a watchCh to the WatchSet if non-nil. +func (w WatchSet) Add(watchCh <-chan struct{}) { + if w == nil { + return + } + + if _, ok := w[watchCh]; !ok { + w[watchCh] = struct{}{} + } +} + +// AddWithLimit appends a watchCh to the WatchSet if non-nil, and if the given +// softLimit hasn't been exceeded. Otherwise, it will watch the given alternate +// channel. It's expected that the altCh will be the same on many calls to this +// function, so you will exceed the soft limit a little bit if you hit this, but +// not by much. +// +// This is useful if you want to track individual items up to some limit, after +// which you watch a higher-level channel (usually a channel from start start of +// an iterator higher up in the radix tree) that will watch a superset of items. +func (w WatchSet) AddWithLimit(softLimit int, watchCh <-chan struct{}, altCh <-chan struct{}) { + // This is safe for a nil WatchSet so we don't need to check that here. + if len(w) < softLimit { + w.Add(watchCh) + } else { + w.Add(altCh) + } +} + +// Watch is used to wait for either the watch set to trigger or a timeout. +// Returns true on timeout. +func (w WatchSet) Watch(timeoutCh <-chan time.Time) bool { + if w == nil { + return false + } + + // Create a context that gets cancelled when the timeout is triggered + ctx, cancel := context.WithCancel(context.Background()) + defer cancel() + + go func() { + select { + case <-timeoutCh: + cancel() + case <-ctx.Done(): + } + }() + + return w.WatchCtx(ctx) == context.Canceled +} + +// WatchCtx is used to wait for either the watch set to trigger or for the +// context to be cancelled. Watch with a timeout channel can be mimicked by +// creating a context with a deadline. WatchCtx should be preferred over Watch. +func (w WatchSet) WatchCtx(ctx context.Context) error { + if w == nil { + return nil + } + + if n := len(w); n <= aFew { + idx := 0 + chunk := make([]<-chan struct{}, aFew) + for watchCh := range w { + chunk[idx] = watchCh + idx++ + } + return watchFew(ctx, chunk) + } + + return w.watchMany(ctx) +} + +// watchMany is used if there are many watchers. +func (w WatchSet) watchMany(ctx context.Context) error { + // Set up a goroutine for each watcher. + triggerCh := make(chan struct{}, 1) + watcher := func(chunk []<-chan struct{}) { + if err := watchFew(ctx, chunk); err == nil { + select { + case triggerCh <- struct{}{}: + default: + } + } + } + + // Apportion the watch channels into chunks we can feed into the + // watchFew helper. + idx := 0 + chunk := make([]<-chan struct{}, aFew) + for watchCh := range w { + subIdx := idx % aFew + chunk[subIdx] = watchCh + idx++ + + // Fire off this chunk and start a fresh one. + if idx%aFew == 0 { + go watcher(chunk) + chunk = make([]<-chan struct{}, aFew) + } + } + + // Make sure to watch any residual channels in the last chunk. + if idx%aFew != 0 { + go watcher(chunk) + } + + // Wait for a channel to trigger or timeout. + select { + case <-triggerCh: + return nil + case <-ctx.Done(): + return ctx.Err() + } +} + +// WatchCh returns a channel that is used to wait for either the watch set to trigger +// or for the context to be cancelled. WatchCh creates a new goroutine each call, so +// callers may need to cache the returned channel to avoid creating extra goroutines. +func (w WatchSet) WatchCh(ctx context.Context) <-chan error { + // Create the outgoing channel + triggerCh := make(chan error, 1) + + // Create a goroutine to collect the error from WatchCtx + go func() { + triggerCh <- w.WatchCtx(ctx) + }() + + return triggerCh +} diff --git a/vendor/github.com/hashicorp/go-memdb/watch_few.go b/vendor/github.com/hashicorp/go-memdb/watch_few.go new file mode 100644 index 0000000000..b211eeea26 --- /dev/null +++ b/vendor/github.com/hashicorp/go-memdb/watch_few.go @@ -0,0 +1,117 @@ +package memdb + +//go:generate sh -c "go run watch-gen/main.go >watch_few.go" + +import ( + "context" +) + +// aFew gives how many watchers this function is wired to support. You must +// always pass a full slice of this length, but unused channels can be nil. +const aFew = 32 + +// watchFew is used if there are only a few watchers as a performance +// optimization. +func watchFew(ctx context.Context, ch []<-chan struct{}) error { + select { + + case <-ch[0]: + return nil + + case <-ch[1]: + return nil + + case <-ch[2]: + return nil + + case <-ch[3]: + return nil + + case <-ch[4]: + return nil + + case <-ch[5]: + return nil + + case <-ch[6]: + return nil + + case <-ch[7]: + return nil + + case <-ch[8]: + return nil + + case <-ch[9]: + return nil + + case <-ch[10]: + return nil + + case <-ch[11]: + return nil + + case <-ch[12]: + return nil + + case <-ch[13]: + return nil + + case <-ch[14]: + return nil + + case <-ch[15]: + return nil + + case <-ch[16]: + return nil + + case <-ch[17]: + return nil + + case <-ch[18]: + return nil + + case <-ch[19]: + return nil + + case <-ch[20]: + return nil + + case <-ch[21]: + return nil + + case <-ch[22]: + return nil + + case <-ch[23]: + return nil + + case <-ch[24]: + return nil + + case <-ch[25]: + return nil + + case <-ch[26]: + return nil + + case <-ch[27]: + return nil + + case <-ch[28]: + return nil + + case <-ch[29]: + return nil + + case <-ch[30]: + return nil + + case <-ch[31]: + return nil + + case <-ctx.Done(): + return ctx.Err() + } +} diff --git a/vendor/github.com/ishidawataru/sctp/sctp.go b/vendor/github.com/ishidawataru/sctp/sctp.go index 94842f4270..add951a2de 100644 --- a/vendor/github.com/ishidawataru/sctp/sctp.go +++ b/vendor/github.com/ishidawataru/sctp/sctp.go @@ -505,6 +505,14 @@ func (c *SCTPConn) GetDefaultSentParam() (*SndRcvInfo, error) { return info, err } +func (c *SCTPConn) Getsockopt(optname, optval, optlen uintptr) (uintptr, uintptr, error) { + return getsockopt(c.fd(), optname, optval, optlen) +} + +func (c *SCTPConn) Setsockopt(optname, optval, optlen uintptr) (uintptr, uintptr, error) { + return setsockopt(c.fd(), optname, optval, optlen) +} + func resolveFromRawAddr(ptr unsafe.Pointer, n int) (*SCTPAddr, error) { addr := &SCTPAddr{ IPAddrs: make([]net.IPAddr, n), diff --git a/vendor/github.com/docker/swarmkit/LICENSE b/vendor/github.com/moby/swarmkit/v2/LICENSE similarity index 100% rename from vendor/github.com/docker/swarmkit/LICENSE rename to vendor/github.com/moby/swarmkit/v2/LICENSE diff --git a/vendor/github.com/docker/swarmkit/agent/agent.go b/vendor/github.com/moby/swarmkit/v2/agent/agent.go similarity index 99% rename from vendor/github.com/docker/swarmkit/agent/agent.go rename to vendor/github.com/moby/swarmkit/v2/agent/agent.go index 65b03b13e5..60df8a602c 100644 --- a/vendor/github.com/docker/swarmkit/agent/agent.go +++ b/vendor/github.com/moby/swarmkit/v2/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/vendor/github.com/docker/swarmkit/agent/config.go b/vendor/github.com/moby/swarmkit/v2/agent/config.go similarity index 94% rename from vendor/github.com/docker/swarmkit/agent/config.go rename to vendor/github.com/moby/swarmkit/v2/agent/config.go index 13024439dd..3afb2383a5 100644 --- a/vendor/github.com/docker/swarmkit/agent/config.go +++ b/vendor/github.com/moby/swarmkit/v2/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/vendor/github.com/docker/swarmkit/agent/configs/configs.go b/vendor/github.com/moby/swarmkit/v2/agent/configs/configs.go similarity index 96% rename from vendor/github.com/docker/swarmkit/agent/configs/configs.go rename to vendor/github.com/moby/swarmkit/v2/agent/configs/configs.go index ae5fc8c18c..7d110cfc91 100644 --- a/vendor/github.com/docker/swarmkit/agent/configs/configs.go +++ b/vendor/github.com/moby/swarmkit/v2/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/vendor/github.com/docker/swarmkit/agent/csi/plugin/manager.go b/vendor/github.com/moby/swarmkit/v2/agent/csi/plugin/manager.go similarity index 98% rename from vendor/github.com/docker/swarmkit/agent/csi/plugin/manager.go rename to vendor/github.com/moby/swarmkit/v2/agent/csi/plugin/manager.go index 3c155cb141..39bb60f450 100644 --- a/vendor/github.com/docker/swarmkit/agent/csi/plugin/manager.go +++ b/vendor/github.com/moby/swarmkit/v2/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/vendor/github.com/docker/swarmkit/agent/csi/plugin/plugin.go b/vendor/github.com/moby/swarmkit/v2/agent/csi/plugin/plugin.go similarity index 99% rename from vendor/github.com/docker/swarmkit/agent/csi/plugin/plugin.go rename to vendor/github.com/moby/swarmkit/v2/agent/csi/plugin/plugin.go index f7f4f72107..543cb057c7 100644 --- a/vendor/github.com/docker/swarmkit/agent/csi/plugin/plugin.go +++ b/vendor/github.com/moby/swarmkit/v2/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/vendor/github.com/docker/swarmkit/agent/csi/volumes.go b/vendor/github.com/moby/swarmkit/v2/agent/csi/volumes.go similarity index 96% rename from vendor/github.com/docker/swarmkit/agent/csi/volumes.go rename to vendor/github.com/moby/swarmkit/v2/agent/csi/volumes.go index ea436c8f85..c9c97a2ff0 100644 --- a/vendor/github.com/docker/swarmkit/agent/csi/volumes.go +++ b/vendor/github.com/moby/swarmkit/v2/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/vendor/github.com/docker/swarmkit/agent/dependency.go b/vendor/github.com/moby/swarmkit/v2/agent/dependency.go similarity index 88% rename from vendor/github.com/docker/swarmkit/agent/dependency.go rename to vendor/github.com/moby/swarmkit/v2/agent/dependency.go index 143f61e386..d123e30a1b 100644 --- a/vendor/github.com/docker/swarmkit/agent/dependency.go +++ b/vendor/github.com/moby/swarmkit/v2/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/vendor/github.com/docker/swarmkit/agent/errors.go b/vendor/github.com/moby/swarmkit/v2/agent/errors.go similarity index 100% rename from vendor/github.com/docker/swarmkit/agent/errors.go rename to vendor/github.com/moby/swarmkit/v2/agent/errors.go diff --git a/vendor/github.com/docker/swarmkit/agent/exec/controller.go b/vendor/github.com/moby/swarmkit/v2/agent/exec/controller.go similarity index 98% rename from vendor/github.com/docker/swarmkit/agent/exec/controller.go rename to vendor/github.com/moby/swarmkit/v2/agent/exec/controller.go index b617d37ca3..3c63ed640d 100644 --- a/vendor/github.com/docker/swarmkit/agent/exec/controller.go +++ b/vendor/github.com/moby/swarmkit/v2/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/vendor/github.com/docker/swarmkit/agent/exec/controller_stub.go b/vendor/github.com/moby/swarmkit/v2/agent/exec/controller_stub.go similarity index 98% rename from vendor/github.com/docker/swarmkit/agent/exec/controller_stub.go rename to vendor/github.com/moby/swarmkit/v2/agent/exec/controller_stub.go index dd16ce457d..6775779e59 100644 --- a/vendor/github.com/docker/swarmkit/agent/exec/controller_stub.go +++ b/vendor/github.com/moby/swarmkit/v2/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/vendor/github.com/docker/swarmkit/agent/exec/errors.go b/vendor/github.com/moby/swarmkit/v2/agent/exec/errors.go similarity index 100% rename from vendor/github.com/docker/swarmkit/agent/exec/errors.go rename to vendor/github.com/moby/swarmkit/v2/agent/exec/errors.go diff --git a/vendor/github.com/docker/swarmkit/agent/exec/executor.go b/vendor/github.com/moby/swarmkit/v2/agent/exec/executor.go similarity index 99% rename from vendor/github.com/docker/swarmkit/agent/exec/executor.go rename to vendor/github.com/moby/swarmkit/v2/agent/exec/executor.go index 36f3bc6021..61a305aec6 100644 --- a/vendor/github.com/docker/swarmkit/agent/exec/executor.go +++ b/vendor/github.com/moby/swarmkit/v2/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/vendor/github.com/docker/swarmkit/agent/helpers.go b/vendor/github.com/moby/swarmkit/v2/agent/helpers.go similarity index 100% rename from vendor/github.com/docker/swarmkit/agent/helpers.go rename to vendor/github.com/moby/swarmkit/v2/agent/helpers.go diff --git a/vendor/github.com/docker/swarmkit/agent/reporter.go b/vendor/github.com/moby/swarmkit/v2/agent/reporter.go similarity index 98% rename from vendor/github.com/docker/swarmkit/agent/reporter.go rename to vendor/github.com/moby/swarmkit/v2/agent/reporter.go index abd3c890a6..db7456c3b7 100644 --- a/vendor/github.com/docker/swarmkit/agent/reporter.go +++ b/vendor/github.com/moby/swarmkit/v2/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/vendor/github.com/docker/swarmkit/agent/resource.go b/vendor/github.com/moby/swarmkit/v2/agent/resource.go similarity index 98% rename from vendor/github.com/docker/swarmkit/agent/resource.go rename to vendor/github.com/moby/swarmkit/v2/agent/resource.go index 32be069c11..5d4dc84fc6 100644 --- a/vendor/github.com/docker/swarmkit/agent/resource.go +++ b/vendor/github.com/moby/swarmkit/v2/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/vendor/github.com/docker/swarmkit/agent/secrets/secrets.go b/vendor/github.com/moby/swarmkit/v2/agent/secrets/secrets.go similarity index 96% rename from vendor/github.com/docker/swarmkit/agent/secrets/secrets.go rename to vendor/github.com/moby/swarmkit/v2/agent/secrets/secrets.go index fb0ee1d3b9..742d116aa4 100644 --- a/vendor/github.com/docker/swarmkit/agent/secrets/secrets.go +++ b/vendor/github.com/moby/swarmkit/v2/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/vendor/github.com/docker/swarmkit/agent/session.go b/vendor/github.com/moby/swarmkit/v2/agent/session.go similarity index 99% rename from vendor/github.com/docker/swarmkit/agent/session.go rename to vendor/github.com/moby/swarmkit/v2/agent/session.go index 240ce8079c..97d5621eb9 100644 --- a/vendor/github.com/docker/swarmkit/agent/session.go +++ b/vendor/github.com/moby/swarmkit/v2/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/vendor/github.com/docker/swarmkit/agent/storage.go b/vendor/github.com/moby/swarmkit/v2/agent/storage.go similarity index 99% rename from vendor/github.com/docker/swarmkit/agent/storage.go rename to vendor/github.com/moby/swarmkit/v2/agent/storage.go index 8d32ebf1ba..3be91e143b 100644 --- a/vendor/github.com/docker/swarmkit/agent/storage.go +++ b/vendor/github.com/moby/swarmkit/v2/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/vendor/github.com/docker/swarmkit/agent/task.go b/vendor/github.com/moby/swarmkit/v2/agent/task.go similarity index 97% rename from vendor/github.com/docker/swarmkit/agent/task.go rename to vendor/github.com/moby/swarmkit/v2/agent/task.go index 17c713c092..a000410445 100644 --- a/vendor/github.com/docker/swarmkit/agent/task.go +++ b/vendor/github.com/moby/swarmkit/v2/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/vendor/github.com/docker/swarmkit/agent/worker.go b/vendor/github.com/moby/swarmkit/v2/agent/worker.go similarity index 99% rename from vendor/github.com/docker/swarmkit/agent/worker.go rename to vendor/github.com/moby/swarmkit/v2/agent/worker.go index 27df5002a3..ad51aa716e 100644 --- a/vendor/github.com/docker/swarmkit/agent/worker.go +++ b/vendor/github.com/moby/swarmkit/v2/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/vendor/github.com/docker/swarmkit/api/README.md b/vendor/github.com/moby/swarmkit/v2/api/README.md similarity index 100% rename from vendor/github.com/docker/swarmkit/api/README.md rename to vendor/github.com/moby/swarmkit/v2/api/README.md diff --git a/vendor/github.com/docker/swarmkit/api/api.pb.txt b/vendor/github.com/moby/swarmkit/v2/api/api.pb.txt similarity index 100% rename from vendor/github.com/docker/swarmkit/api/api.pb.txt rename to vendor/github.com/moby/swarmkit/v2/api/api.pb.txt diff --git a/vendor/github.com/docker/swarmkit/api/ca.pb.go b/vendor/github.com/moby/swarmkit/v2/api/ca.pb.go similarity index 99% rename from vendor/github.com/docker/swarmkit/api/ca.pb.go rename to vendor/github.com/moby/swarmkit/v2/api/ca.pb.go index e37dbc97a2..42e77d893d 100644 --- a/vendor/github.com/docker/swarmkit/api/ca.pb.go +++ b/vendor/github.com/moby/swarmkit/v2/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" + _ "github.com/moby/swarmkit/v2/protobuf/plugin" 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/vendor/github.com/docker/swarmkit/api/ca.proto b/vendor/github.com/moby/swarmkit/v2/api/ca.proto similarity index 100% rename from vendor/github.com/docker/swarmkit/api/ca.proto rename to vendor/github.com/moby/swarmkit/v2/api/ca.proto diff --git a/vendor/github.com/docker/swarmkit/api/control.pb.go b/vendor/github.com/moby/swarmkit/v2/api/control.pb.go similarity index 99% rename from vendor/github.com/docker/swarmkit/api/control.pb.go rename to vendor/github.com/moby/swarmkit/v2/api/control.pb.go index 38f1c009bc..a040b9c1fc 100644 --- a/vendor/github.com/docker/swarmkit/api/control.pb.go +++ b/vendor/github.com/moby/swarmkit/v2/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" + _ "github.com/moby/swarmkit/v2/protobuf/plugin" 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/vendor/github.com/docker/swarmkit/api/control.proto b/vendor/github.com/moby/swarmkit/v2/api/control.proto similarity index 100% rename from vendor/github.com/docker/swarmkit/api/control.proto rename to vendor/github.com/moby/swarmkit/v2/api/control.proto diff --git a/vendor/github.com/docker/swarmkit/api/deepcopy/copy.go b/vendor/github.com/moby/swarmkit/v2/api/deepcopy/copy.go similarity index 100% rename from vendor/github.com/docker/swarmkit/api/deepcopy/copy.go rename to vendor/github.com/moby/swarmkit/v2/api/deepcopy/copy.go diff --git a/vendor/github.com/docker/swarmkit/api/defaults/service.go b/vendor/github.com/moby/swarmkit/v2/api/defaults/service.go similarity index 97% rename from vendor/github.com/docker/swarmkit/api/defaults/service.go rename to vendor/github.com/moby/swarmkit/v2/api/defaults/service.go index ce1e86435a..461378ffca 100644 --- a/vendor/github.com/docker/swarmkit/api/defaults/service.go +++ b/vendor/github.com/moby/swarmkit/v2/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/vendor/github.com/docker/swarmkit/api/dispatcher.pb.go b/vendor/github.com/moby/swarmkit/v2/api/dispatcher.pb.go similarity index 99% rename from vendor/github.com/docker/swarmkit/api/dispatcher.pb.go rename to vendor/github.com/moby/swarmkit/v2/api/dispatcher.pb.go index 7bde892fc2..00542edd9d 100644 --- a/vendor/github.com/docker/swarmkit/api/dispatcher.pb.go +++ b/vendor/github.com/moby/swarmkit/v2/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" + _ "github.com/moby/swarmkit/v2/protobuf/plugin" 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/vendor/github.com/docker/swarmkit/api/dispatcher.proto b/vendor/github.com/moby/swarmkit/v2/api/dispatcher.proto similarity index 100% rename from vendor/github.com/docker/swarmkit/api/dispatcher.proto rename to vendor/github.com/moby/swarmkit/v2/api/dispatcher.proto diff --git a/vendor/github.com/docker/swarmkit/api/equality/equality.go b/vendor/github.com/moby/swarmkit/v2/api/equality/equality.go similarity index 98% rename from vendor/github.com/docker/swarmkit/api/equality/equality.go rename to vendor/github.com/moby/swarmkit/v2/api/equality/equality.go index 522c719810..97eea64252 100644 --- a/vendor/github.com/docker/swarmkit/api/equality/equality.go +++ b/vendor/github.com/moby/swarmkit/v2/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/vendor/github.com/docker/swarmkit/api/genericresource/helpers.go b/vendor/github.com/moby/swarmkit/v2/api/genericresource/helpers.go similarity index 98% rename from vendor/github.com/docker/swarmkit/api/genericresource/helpers.go rename to vendor/github.com/moby/swarmkit/v2/api/genericresource/helpers.go index 350ab730c1..8c29100357 100644 --- a/vendor/github.com/docker/swarmkit/api/genericresource/helpers.go +++ b/vendor/github.com/moby/swarmkit/v2/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/vendor/github.com/docker/swarmkit/api/genericresource/parse.go b/vendor/github.com/moby/swarmkit/v2/api/genericresource/parse.go similarity index 98% rename from vendor/github.com/docker/swarmkit/api/genericresource/parse.go rename to vendor/github.com/moby/swarmkit/v2/api/genericresource/parse.go index f39a7077a8..7c2a359138 100644 --- a/vendor/github.com/docker/swarmkit/api/genericresource/parse.go +++ b/vendor/github.com/moby/swarmkit/v2/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/vendor/github.com/docker/swarmkit/api/genericresource/resource_management.go b/vendor/github.com/moby/swarmkit/v2/api/genericresource/resource_management.go similarity index 99% rename from vendor/github.com/docker/swarmkit/api/genericresource/resource_management.go rename to vendor/github.com/moby/swarmkit/v2/api/genericresource/resource_management.go index 506257ab97..86a358363f 100644 --- a/vendor/github.com/docker/swarmkit/api/genericresource/resource_management.go +++ b/vendor/github.com/moby/swarmkit/v2/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/vendor/github.com/docker/swarmkit/api/genericresource/string.go b/vendor/github.com/moby/swarmkit/v2/api/genericresource/string.go similarity index 97% rename from vendor/github.com/docker/swarmkit/api/genericresource/string.go rename to vendor/github.com/moby/swarmkit/v2/api/genericresource/string.go index 5e388bebb0..ded52ffed7 100644 --- a/vendor/github.com/docker/swarmkit/api/genericresource/string.go +++ b/vendor/github.com/moby/swarmkit/v2/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/vendor/github.com/docker/swarmkit/api/genericresource/validate.go b/vendor/github.com/moby/swarmkit/v2/api/genericresource/validate.go similarity index 98% rename from vendor/github.com/docker/swarmkit/api/genericresource/validate.go rename to vendor/github.com/moby/swarmkit/v2/api/genericresource/validate.go index 0ad49ff75f..19f2040a70 100644 --- a/vendor/github.com/docker/swarmkit/api/genericresource/validate.go +++ b/vendor/github.com/moby/swarmkit/v2/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/vendor/github.com/docker/swarmkit/api/health.pb.go b/vendor/github.com/moby/swarmkit/v2/api/health.pb.go similarity index 99% rename from vendor/github.com/docker/swarmkit/api/health.pb.go rename to vendor/github.com/moby/swarmkit/v2/api/health.pb.go index 3ca506a031..b5795d4da0 100644 --- a/vendor/github.com/docker/swarmkit/api/health.pb.go +++ b/vendor/github.com/moby/swarmkit/v2/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" + _ "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/vendor/github.com/docker/swarmkit/api/health.proto b/vendor/github.com/moby/swarmkit/v2/api/health.proto similarity index 100% rename from vendor/github.com/docker/swarmkit/api/health.proto rename to vendor/github.com/moby/swarmkit/v2/api/health.proto diff --git a/vendor/github.com/docker/swarmkit/api/logbroker.pb.go b/vendor/github.com/moby/swarmkit/v2/api/logbroker.pb.go similarity index 99% rename from vendor/github.com/docker/swarmkit/api/logbroker.pb.go rename to vendor/github.com/moby/swarmkit/v2/api/logbroker.pb.go index 1b95b226c7..05cacafd78 100644 --- a/vendor/github.com/docker/swarmkit/api/logbroker.pb.go +++ b/vendor/github.com/moby/swarmkit/v2/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" + _ "github.com/moby/swarmkit/v2/protobuf/plugin" 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/vendor/github.com/docker/swarmkit/api/logbroker.proto b/vendor/github.com/moby/swarmkit/v2/api/logbroker.proto similarity index 100% rename from vendor/github.com/docker/swarmkit/api/logbroker.proto rename to vendor/github.com/moby/swarmkit/v2/api/logbroker.proto diff --git a/vendor/github.com/docker/swarmkit/api/naming/naming.go b/vendor/github.com/moby/swarmkit/v2/api/naming/naming.go similarity index 97% rename from vendor/github.com/docker/swarmkit/api/naming/naming.go rename to vendor/github.com/moby/swarmkit/v2/api/naming/naming.go index 7e7d4581ea..05edcdadfe 100644 --- a/vendor/github.com/docker/swarmkit/api/naming/naming.go +++ b/vendor/github.com/moby/swarmkit/v2/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/vendor/github.com/docker/swarmkit/api/objects.pb.go b/vendor/github.com/moby/swarmkit/v2/api/objects.pb.go similarity index 98% rename from vendor/github.com/docker/swarmkit/api/objects.pb.go rename to vendor/github.com/moby/swarmkit/v2/api/objects.pb.go index d3cd6c0ce4..cbd14db42f 100644 --- a/vendor/github.com/docker/swarmkit/api/objects.pb.go +++ b/vendor/github.com/moby/swarmkit/v2/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" + _ "github.com/moby/swarmkit/v2/protobuf/plugin" 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/vendor/github.com/docker/swarmkit/api/objects.proto b/vendor/github.com/moby/swarmkit/v2/api/objects.proto similarity index 100% rename from vendor/github.com/docker/swarmkit/api/objects.proto rename to vendor/github.com/moby/swarmkit/v2/api/objects.proto diff --git a/vendor/github.com/docker/swarmkit/api/raft.pb.go b/vendor/github.com/moby/swarmkit/v2/api/raft.pb.go similarity index 98% rename from vendor/github.com/docker/swarmkit/api/raft.pb.go rename to vendor/github.com/moby/swarmkit/v2/api/raft.pb.go index a4619a40e2..96fa855077 100644 --- a/vendor/github.com/docker/swarmkit/api/raft.pb.go +++ b/vendor/github.com/moby/swarmkit/v2/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/vendor/github.com/docker/swarmkit/api/raft.proto b/vendor/github.com/moby/swarmkit/v2/api/raft.proto similarity index 100% rename from vendor/github.com/docker/swarmkit/api/raft.proto rename to vendor/github.com/moby/swarmkit/v2/api/raft.proto diff --git a/vendor/github.com/docker/swarmkit/api/resource.pb.go b/vendor/github.com/moby/swarmkit/v2/api/resource.pb.go similarity index 99% rename from vendor/github.com/docker/swarmkit/api/resource.pb.go rename to vendor/github.com/moby/swarmkit/v2/api/resource.pb.go index 8c9cf71e26..3466e44073 100644 --- a/vendor/github.com/docker/swarmkit/api/resource.pb.go +++ b/vendor/github.com/moby/swarmkit/v2/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" + _ "github.com/moby/swarmkit/v2/protobuf/plugin" 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/vendor/github.com/docker/swarmkit/api/resource.proto b/vendor/github.com/moby/swarmkit/v2/api/resource.proto similarity index 100% rename from vendor/github.com/docker/swarmkit/api/resource.proto rename to vendor/github.com/moby/swarmkit/v2/api/resource.proto diff --git a/vendor/github.com/docker/swarmkit/api/snapshot.pb.go b/vendor/github.com/moby/swarmkit/v2/api/snapshot.pb.go similarity index 97% rename from vendor/github.com/docker/swarmkit/api/snapshot.pb.go rename to vendor/github.com/moby/swarmkit/v2/api/snapshot.pb.go index 00233f6d1f..7ab5d978d0 100644 --- a/vendor/github.com/docker/swarmkit/api/snapshot.pb.go +++ b/vendor/github.com/moby/swarmkit/v2/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/vendor/github.com/docker/swarmkit/api/snapshot.proto b/vendor/github.com/moby/swarmkit/v2/api/snapshot.proto similarity index 100% rename from vendor/github.com/docker/swarmkit/api/snapshot.proto rename to vendor/github.com/moby/swarmkit/v2/api/snapshot.proto diff --git a/vendor/github.com/docker/swarmkit/api/specs.pb.go b/vendor/github.com/moby/swarmkit/v2/api/specs.pb.go similarity index 98% rename from vendor/github.com/docker/swarmkit/api/specs.pb.go rename to vendor/github.com/moby/swarmkit/v2/api/specs.pb.go index 216be651f9..a789d5a95e 100644 --- a/vendor/github.com/docker/swarmkit/api/specs.pb.go +++ b/vendor/github.com/moby/swarmkit/v2/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/vendor/github.com/docker/swarmkit/api/specs.proto b/vendor/github.com/moby/swarmkit/v2/api/specs.proto similarity index 100% rename from vendor/github.com/docker/swarmkit/api/specs.proto rename to vendor/github.com/moby/swarmkit/v2/api/specs.proto diff --git a/vendor/github.com/docker/swarmkit/api/storeobject.go b/vendor/github.com/moby/swarmkit/v2/api/storeobject.go similarity index 100% rename from vendor/github.com/docker/swarmkit/api/storeobject.go rename to vendor/github.com/moby/swarmkit/v2/api/storeobject.go diff --git a/vendor/github.com/docker/swarmkit/api/types.pb.go b/vendor/github.com/moby/swarmkit/v2/api/types.pb.go similarity index 99% rename from vendor/github.com/docker/swarmkit/api/types.pb.go rename to vendor/github.com/moby/swarmkit/v2/api/types.pb.go index f916111cd5..779e3e10c7 100644 --- a/vendor/github.com/docker/swarmkit/api/types.pb.go +++ b/vendor/github.com/moby/swarmkit/v2/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/vendor/github.com/docker/swarmkit/api/types.proto b/vendor/github.com/moby/swarmkit/v2/api/types.proto similarity index 100% rename from vendor/github.com/docker/swarmkit/api/types.proto rename to vendor/github.com/moby/swarmkit/v2/api/types.proto diff --git a/vendor/github.com/docker/swarmkit/api/validation/secrets.go b/vendor/github.com/moby/swarmkit/v2/api/validation/secrets.go similarity index 100% rename from vendor/github.com/docker/swarmkit/api/validation/secrets.go rename to vendor/github.com/moby/swarmkit/v2/api/validation/secrets.go diff --git a/vendor/github.com/docker/swarmkit/api/watch.pb.go b/vendor/github.com/moby/swarmkit/v2/api/watch.pb.go similarity index 98% rename from vendor/github.com/docker/swarmkit/api/watch.pb.go rename to vendor/github.com/moby/swarmkit/v2/api/watch.pb.go index 2ff66cb5aa..9203d58db1 100644 --- a/vendor/github.com/docker/swarmkit/api/watch.pb.go +++ b/vendor/github.com/moby/swarmkit/v2/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" + _ "github.com/moby/swarmkit/v2/protobuf/plugin" 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/vendor/github.com/docker/swarmkit/api/watch.proto b/vendor/github.com/moby/swarmkit/v2/api/watch.proto similarity index 100% rename from vendor/github.com/docker/swarmkit/api/watch.proto rename to vendor/github.com/moby/swarmkit/v2/api/watch.proto diff --git a/vendor/github.com/docker/swarmkit/ca/auth.go b/vendor/github.com/moby/swarmkit/v2/ca/auth.go similarity index 99% rename from vendor/github.com/docker/swarmkit/ca/auth.go rename to vendor/github.com/moby/swarmkit/v2/ca/auth.go index e0ff898c19..40890a9699 100644 --- a/vendor/github.com/docker/swarmkit/ca/auth.go +++ b/vendor/github.com/moby/swarmkit/v2/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/vendor/github.com/docker/swarmkit/ca/certificates.go b/vendor/github.com/moby/swarmkit/v2/ca/certificates.go similarity index 99% rename from vendor/github.com/docker/swarmkit/ca/certificates.go rename to vendor/github.com/moby/swarmkit/v2/ca/certificates.go index 2598057902..e15cc93360 100644 --- a/vendor/github.com/docker/swarmkit/ca/certificates.go +++ b/vendor/github.com/moby/swarmkit/v2/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/vendor/github.com/docker/swarmkit/ca/config.go b/vendor/github.com/moby/swarmkit/v2/ca/config.go similarity index 99% rename from vendor/github.com/docker/swarmkit/ca/config.go rename to vendor/github.com/moby/swarmkit/v2/ca/config.go index 4befee5bcc..f70052bc59 100644 --- a/vendor/github.com/docker/swarmkit/ca/config.go +++ b/vendor/github.com/moby/swarmkit/v2/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/vendor/github.com/docker/swarmkit/ca/external.go b/vendor/github.com/moby/swarmkit/v2/ca/external.go similarity index 99% rename from vendor/github.com/docker/swarmkit/ca/external.go rename to vendor/github.com/moby/swarmkit/v2/ca/external.go index e455a6dbf7..ddf7c88767 100644 --- a/vendor/github.com/docker/swarmkit/ca/external.go +++ b/vendor/github.com/moby/swarmkit/v2/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/vendor/github.com/docker/swarmkit/ca/forward.go b/vendor/github.com/moby/swarmkit/v2/ca/forward.go similarity index 100% rename from vendor/github.com/docker/swarmkit/ca/forward.go rename to vendor/github.com/moby/swarmkit/v2/ca/forward.go diff --git a/vendor/github.com/docker/swarmkit/ca/keyreadwriter.go b/vendor/github.com/moby/swarmkit/v2/ca/keyreadwriter.go similarity index 99% rename from vendor/github.com/docker/swarmkit/ca/keyreadwriter.go rename to vendor/github.com/moby/swarmkit/v2/ca/keyreadwriter.go index 4e66d7e056..55f7d6ba4a 100644 --- a/vendor/github.com/docker/swarmkit/ca/keyreadwriter.go +++ b/vendor/github.com/moby/swarmkit/v2/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/vendor/github.com/docker/swarmkit/ca/keyutils/keyutils.go b/vendor/github.com/moby/swarmkit/v2/ca/keyutils/keyutils.go similarity index 98% rename from vendor/github.com/docker/swarmkit/ca/keyutils/keyutils.go rename to vendor/github.com/moby/swarmkit/v2/ca/keyutils/keyutils.go index ea45aab7dd..8f479ea197 100644 --- a/vendor/github.com/docker/swarmkit/ca/keyutils/keyutils.go +++ b/vendor/github.com/moby/swarmkit/v2/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/vendor/github.com/docker/swarmkit/ca/pkcs8/pkcs8.go b/vendor/github.com/moby/swarmkit/v2/ca/pkcs8/pkcs8.go similarity index 100% rename from vendor/github.com/docker/swarmkit/ca/pkcs8/pkcs8.go rename to vendor/github.com/moby/swarmkit/v2/ca/pkcs8/pkcs8.go diff --git a/vendor/github.com/docker/swarmkit/ca/reconciler.go b/vendor/github.com/moby/swarmkit/v2/ca/reconciler.go similarity index 98% rename from vendor/github.com/docker/swarmkit/ca/reconciler.go rename to vendor/github.com/moby/swarmkit/v2/ca/reconciler.go index d906475d9b..01a9558ece 100644 --- a/vendor/github.com/docker/swarmkit/ca/reconciler.go +++ b/vendor/github.com/moby/swarmkit/v2/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/vendor/github.com/docker/swarmkit/ca/renewer.go b/vendor/github.com/moby/swarmkit/v2/ca/renewer.go similarity index 98% rename from vendor/github.com/docker/swarmkit/ca/renewer.go rename to vendor/github.com/moby/swarmkit/v2/ca/renewer.go index e5d165f6a8..f5c9780ae6 100644 --- a/vendor/github.com/docker/swarmkit/ca/renewer.go +++ b/vendor/github.com/moby/swarmkit/v2/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/vendor/github.com/docker/swarmkit/ca/server.go b/vendor/github.com/moby/swarmkit/v2/ca/server.go similarity index 99% rename from vendor/github.com/docker/swarmkit/ca/server.go rename to vendor/github.com/moby/swarmkit/v2/ca/server.go index 01959972e9..fc6aeff4d7 100644 --- a/vendor/github.com/docker/swarmkit/ca/server.go +++ b/vendor/github.com/moby/swarmkit/v2/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/vendor/github.com/docker/swarmkit/ca/transport.go b/vendor/github.com/moby/swarmkit/v2/ca/transport.go similarity index 100% rename from vendor/github.com/docker/swarmkit/ca/transport.go rename to vendor/github.com/moby/swarmkit/v2/ca/transport.go diff --git a/vendor/github.com/docker/swarmkit/connectionbroker/broker.go b/vendor/github.com/moby/swarmkit/v2/connectionbroker/broker.go similarity index 97% rename from vendor/github.com/docker/swarmkit/connectionbroker/broker.go rename to vendor/github.com/moby/swarmkit/v2/connectionbroker/broker.go index a5510a9ff0..81ea4fa3e1 100644 --- a/vendor/github.com/docker/swarmkit/connectionbroker/broker.go +++ b/vendor/github.com/moby/swarmkit/v2/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/vendor/github.com/docker/swarmkit/identity/combined_id.go b/vendor/github.com/moby/swarmkit/v2/identity/combined_id.go similarity index 100% rename from vendor/github.com/docker/swarmkit/identity/combined_id.go rename to vendor/github.com/moby/swarmkit/v2/identity/combined_id.go diff --git a/vendor/github.com/docker/swarmkit/identity/doc.go b/vendor/github.com/moby/swarmkit/v2/identity/doc.go similarity index 100% rename from vendor/github.com/docker/swarmkit/identity/doc.go rename to vendor/github.com/moby/swarmkit/v2/identity/doc.go diff --git a/vendor/github.com/docker/swarmkit/identity/randomid.go b/vendor/github.com/moby/swarmkit/v2/identity/randomid.go similarity index 100% rename from vendor/github.com/docker/swarmkit/identity/randomid.go rename to vendor/github.com/moby/swarmkit/v2/identity/randomid.go diff --git a/vendor/github.com/docker/swarmkit/ioutils/ioutils.go b/vendor/github.com/moby/swarmkit/v2/ioutils/ioutils.go similarity index 100% rename from vendor/github.com/docker/swarmkit/ioutils/ioutils.go rename to vendor/github.com/moby/swarmkit/v2/ioutils/ioutils.go diff --git a/vendor/github.com/docker/swarmkit/log/context.go b/vendor/github.com/moby/swarmkit/v2/log/context.go similarity index 100% rename from vendor/github.com/docker/swarmkit/log/context.go rename to vendor/github.com/moby/swarmkit/v2/log/context.go diff --git a/vendor/github.com/docker/swarmkit/log/grpc.go b/vendor/github.com/moby/swarmkit/v2/log/grpc.go similarity index 100% rename from vendor/github.com/docker/swarmkit/log/grpc.go rename to vendor/github.com/moby/swarmkit/v2/log/grpc.go diff --git a/vendor/github.com/docker/swarmkit/manager/allocator/allocator.go b/vendor/github.com/moby/swarmkit/v2/manager/allocator/allocator.go similarity index 96% rename from vendor/github.com/docker/swarmkit/manager/allocator/allocator.go rename to vendor/github.com/moby/swarmkit/v2/manager/allocator/allocator.go index b4cc1c9e86..a35039732f 100644 --- a/vendor/github.com/docker/swarmkit/manager/allocator/allocator.go +++ b/vendor/github.com/moby/swarmkit/v2/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/vendor/github.com/docker/swarmkit/manager/allocator/cnmallocator/drivers_darwin.go b/vendor/github.com/moby/swarmkit/v2/manager/allocator/cnmallocator/drivers_darwin.go similarity index 85% rename from vendor/github.com/docker/swarmkit/manager/allocator/cnmallocator/drivers_darwin.go rename to vendor/github.com/moby/swarmkit/v2/manager/allocator/cnmallocator/drivers_darwin.go index 1767ee0f1c..e7d3dbe710 100644 --- a/vendor/github.com/docker/swarmkit/manager/allocator/cnmallocator/drivers_darwin.go +++ b/vendor/github.com/moby/swarmkit/v2/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/vendor/github.com/docker/swarmkit/manager/allocator/cnmallocator/drivers_ipam.go b/vendor/github.com/moby/swarmkit/v2/manager/allocator/cnmallocator/drivers_ipam.go similarity index 100% rename from vendor/github.com/docker/swarmkit/manager/allocator/cnmallocator/drivers_ipam.go rename to vendor/github.com/moby/swarmkit/v2/manager/allocator/cnmallocator/drivers_ipam.go diff --git a/vendor/github.com/docker/swarmkit/manager/allocator/cnmallocator/drivers_network_linux.go b/vendor/github.com/moby/swarmkit/v2/manager/allocator/cnmallocator/drivers_network_linux.go similarity index 92% rename from vendor/github.com/docker/swarmkit/manager/allocator/cnmallocator/drivers_network_linux.go rename to vendor/github.com/moby/swarmkit/v2/manager/allocator/cnmallocator/drivers_network_linux.go index 9d3b0e51cb..5ae9196977 100644 --- a/vendor/github.com/docker/swarmkit/manager/allocator/cnmallocator/drivers_network_linux.go +++ b/vendor/github.com/moby/swarmkit/v2/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/vendor/github.com/docker/swarmkit/manager/allocator/cnmallocator/drivers_network_windows.go b/vendor/github.com/moby/swarmkit/v2/manager/allocator/cnmallocator/drivers_network_windows.go similarity index 85% rename from vendor/github.com/docker/swarmkit/manager/allocator/cnmallocator/drivers_network_windows.go rename to vendor/github.com/moby/swarmkit/v2/manager/allocator/cnmallocator/drivers_network_windows.go index 1767ee0f1c..e7d3dbe710 100644 --- a/vendor/github.com/docker/swarmkit/manager/allocator/cnmallocator/drivers_network_windows.go +++ b/vendor/github.com/moby/swarmkit/v2/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/vendor/github.com/docker/swarmkit/manager/allocator/cnmallocator/drivers_unsupported.go b/vendor/github.com/moby/swarmkit/v2/manager/allocator/cnmallocator/drivers_unsupported.go similarity index 81% rename from vendor/github.com/docker/swarmkit/manager/allocator/cnmallocator/drivers_unsupported.go rename to vendor/github.com/moby/swarmkit/v2/manager/allocator/cnmallocator/drivers_unsupported.go index 120971be52..2d1f17cb1f 100644 --- a/vendor/github.com/docker/swarmkit/manager/allocator/cnmallocator/drivers_unsupported.go +++ b/vendor/github.com/moby/swarmkit/v2/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/vendor/github.com/docker/swarmkit/manager/allocator/cnmallocator/networkallocator.go b/vendor/github.com/moby/swarmkit/v2/manager/allocator/cnmallocator/networkallocator.go similarity index 99% rename from vendor/github.com/docker/swarmkit/manager/allocator/cnmallocator/networkallocator.go rename to vendor/github.com/moby/swarmkit/v2/manager/allocator/cnmallocator/networkallocator.go index a21ba1cfa6..ad4dc03e1a 100644 --- a/vendor/github.com/docker/swarmkit/manager/allocator/cnmallocator/networkallocator.go +++ b/vendor/github.com/moby/swarmkit/v2/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/vendor/github.com/docker/swarmkit/manager/allocator/cnmallocator/portallocator.go b/vendor/github.com/moby/swarmkit/v2/manager/allocator/cnmallocator/portallocator.go similarity index 99% rename from vendor/github.com/docker/swarmkit/manager/allocator/cnmallocator/portallocator.go rename to vendor/github.com/moby/swarmkit/v2/manager/allocator/cnmallocator/portallocator.go index f5e4b60bd1..303ac13b6b 100644 --- a/vendor/github.com/docker/swarmkit/manager/allocator/cnmallocator/portallocator.go +++ b/vendor/github.com/moby/swarmkit/v2/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/vendor/github.com/docker/swarmkit/manager/allocator/doc.go b/vendor/github.com/moby/swarmkit/v2/manager/allocator/doc.go similarity index 100% rename from vendor/github.com/docker/swarmkit/manager/allocator/doc.go rename to vendor/github.com/moby/swarmkit/v2/manager/allocator/doc.go diff --git a/vendor/github.com/docker/swarmkit/manager/allocator/network.go b/vendor/github.com/moby/swarmkit/v2/manager/allocator/network.go similarity index 99% rename from vendor/github.com/docker/swarmkit/manager/allocator/network.go rename to vendor/github.com/moby/swarmkit/v2/manager/allocator/network.go index fee3bf1d44..d39f8627d9 100644 --- a/vendor/github.com/docker/swarmkit/manager/allocator/network.go +++ b/vendor/github.com/moby/swarmkit/v2/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/vendor/github.com/docker/swarmkit/manager/allocator/networkallocator/networkallocator.go b/vendor/github.com/moby/swarmkit/v2/manager/allocator/networkallocator/networkallocator.go similarity index 99% rename from vendor/github.com/docker/swarmkit/manager/allocator/networkallocator/networkallocator.go rename to vendor/github.com/moby/swarmkit/v2/manager/allocator/networkallocator/networkallocator.go index f6b69b4d81..bb7085ce00 100644 --- a/vendor/github.com/docker/swarmkit/manager/allocator/networkallocator/networkallocator.go +++ b/vendor/github.com/moby/swarmkit/v2/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/vendor/github.com/docker/swarmkit/manager/constraint/constraint.go b/vendor/github.com/moby/swarmkit/v2/manager/constraint/constraint.go similarity index 99% rename from vendor/github.com/docker/swarmkit/manager/constraint/constraint.go rename to vendor/github.com/moby/swarmkit/v2/manager/constraint/constraint.go index 6c49c07728..c523b47f02 100644 --- a/vendor/github.com/docker/swarmkit/manager/constraint/constraint.go +++ b/vendor/github.com/moby/swarmkit/v2/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/vendor/github.com/docker/swarmkit/manager/controlapi/ca_rotation.go b/vendor/github.com/moby/swarmkit/v2/manager/controlapi/ca_rotation.go similarity index 99% rename from vendor/github.com/docker/swarmkit/manager/controlapi/ca_rotation.go rename to vendor/github.com/moby/swarmkit/v2/manager/controlapi/ca_rotation.go index 91869a8d0a..7e95ee2b23 100644 --- a/vendor/github.com/docker/swarmkit/manager/controlapi/ca_rotation.go +++ b/vendor/github.com/moby/swarmkit/v2/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/vendor/github.com/docker/swarmkit/manager/controlapi/cluster.go b/vendor/github.com/moby/swarmkit/v2/manager/controlapi/cluster.go similarity index 98% rename from vendor/github.com/docker/swarmkit/manager/controlapi/cluster.go rename to vendor/github.com/moby/swarmkit/v2/manager/controlapi/cluster.go index 73915f3eae..b9e561937a 100644 --- a/vendor/github.com/docker/swarmkit/manager/controlapi/cluster.go +++ b/vendor/github.com/moby/swarmkit/v2/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/vendor/github.com/docker/swarmkit/manager/controlapi/common.go b/vendor/github.com/moby/swarmkit/v2/manager/controlapi/common.go similarity index 96% rename from vendor/github.com/docker/swarmkit/manager/controlapi/common.go rename to vendor/github.com/moby/swarmkit/v2/manager/controlapi/common.go index 6a4b92add4..4a0102423a 100644 --- a/vendor/github.com/docker/swarmkit/manager/controlapi/common.go +++ b/vendor/github.com/moby/swarmkit/v2/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/vendor/github.com/docker/swarmkit/manager/controlapi/config.go b/vendor/github.com/moby/swarmkit/v2/manager/controlapi/config.go similarity index 98% rename from vendor/github.com/docker/swarmkit/manager/controlapi/config.go rename to vendor/github.com/moby/swarmkit/v2/manager/controlapi/config.go index c7ec392240..be7463f441 100644 --- a/vendor/github.com/docker/swarmkit/manager/controlapi/config.go +++ b/vendor/github.com/moby/swarmkit/v2/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/vendor/github.com/docker/swarmkit/manager/controlapi/extension.go b/vendor/github.com/moby/swarmkit/v2/manager/controlapi/extension.go similarity index 96% rename from vendor/github.com/docker/swarmkit/manager/controlapi/extension.go rename to vendor/github.com/moby/swarmkit/v2/manager/controlapi/extension.go index 321ec762d3..dbe3a5a9ce 100644 --- a/vendor/github.com/docker/swarmkit/manager/controlapi/extension.go +++ b/vendor/github.com/moby/swarmkit/v2/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/vendor/github.com/docker/swarmkit/manager/controlapi/network.go b/vendor/github.com/moby/swarmkit/v2/manager/controlapi/network.go similarity index 97% rename from vendor/github.com/docker/swarmkit/manager/controlapi/network.go rename to vendor/github.com/moby/swarmkit/v2/manager/controlapi/network.go index ccb885d010..6de67e3a7c 100644 --- a/vendor/github.com/docker/swarmkit/manager/controlapi/network.go +++ b/vendor/github.com/moby/swarmkit/v2/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/vendor/github.com/docker/swarmkit/manager/controlapi/node.go b/vendor/github.com/moby/swarmkit/v2/manager/controlapi/node.go similarity index 98% rename from vendor/github.com/docker/swarmkit/manager/controlapi/node.go rename to vendor/github.com/moby/swarmkit/v2/manager/controlapi/node.go index 6e8bdba5bd..0ffa6e146d 100644 --- a/vendor/github.com/docker/swarmkit/manager/controlapi/node.go +++ b/vendor/github.com/moby/swarmkit/v2/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/vendor/github.com/docker/swarmkit/manager/controlapi/resource.go b/vendor/github.com/moby/swarmkit/v2/manager/controlapi/resource.go similarity index 98% rename from vendor/github.com/docker/swarmkit/manager/controlapi/resource.go rename to vendor/github.com/moby/swarmkit/v2/manager/controlapi/resource.go index 8ae5cb1375..618285343a 100644 --- a/vendor/github.com/docker/swarmkit/manager/controlapi/resource.go +++ b/vendor/github.com/moby/swarmkit/v2/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/vendor/github.com/docker/swarmkit/manager/controlapi/secret.go b/vendor/github.com/moby/swarmkit/v2/manager/controlapi/secret.go similarity index 97% rename from vendor/github.com/docker/swarmkit/manager/controlapi/secret.go rename to vendor/github.com/moby/swarmkit/v2/manager/controlapi/secret.go index f3d87d1a7c..b7dbf80c48 100644 --- a/vendor/github.com/docker/swarmkit/manager/controlapi/secret.go +++ b/vendor/github.com/moby/swarmkit/v2/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/vendor/github.com/docker/swarmkit/manager/controlapi/server.go b/vendor/github.com/moby/swarmkit/v2/manager/controlapi/server.go similarity index 80% rename from vendor/github.com/docker/swarmkit/manager/controlapi/server.go rename to vendor/github.com/moby/swarmkit/v2/manager/controlapi/server.go index c16e229175..75bd0a4be3 100644 --- a/vendor/github.com/docker/swarmkit/manager/controlapi/server.go +++ b/vendor/github.com/moby/swarmkit/v2/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/vendor/github.com/docker/swarmkit/manager/controlapi/service.go b/vendor/github.com/moby/swarmkit/v2/manager/controlapi/service.go similarity index 98% rename from vendor/github.com/docker/swarmkit/manager/controlapi/service.go rename to vendor/github.com/moby/swarmkit/v2/manager/controlapi/service.go index e4db20b17f..86339ef76e 100644 --- a/vendor/github.com/docker/swarmkit/manager/controlapi/service.go +++ b/vendor/github.com/moby/swarmkit/v2/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/vendor/github.com/docker/swarmkit/manager/controlapi/task.go b/vendor/github.com/moby/swarmkit/v2/manager/controlapi/task.go similarity index 96% rename from vendor/github.com/docker/swarmkit/manager/controlapi/task.go rename to vendor/github.com/moby/swarmkit/v2/manager/controlapi/task.go index 5f85f9a93c..00dcc3dcb0 100644 --- a/vendor/github.com/docker/swarmkit/manager/controlapi/task.go +++ b/vendor/github.com/moby/swarmkit/v2/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/vendor/github.com/docker/swarmkit/manager/controlapi/volume.go b/vendor/github.com/moby/swarmkit/v2/manager/controlapi/volume.go similarity index 98% rename from vendor/github.com/docker/swarmkit/manager/controlapi/volume.go rename to vendor/github.com/moby/swarmkit/v2/manager/controlapi/volume.go index 157059a961..8b01eb5c5d 100644 --- a/vendor/github.com/docker/swarmkit/manager/controlapi/volume.go +++ b/vendor/github.com/moby/swarmkit/v2/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/vendor/github.com/docker/swarmkit/manager/csi/convert.go b/vendor/github.com/moby/swarmkit/v2/manager/csi/convert.go similarity index 99% rename from vendor/github.com/docker/swarmkit/manager/csi/convert.go rename to vendor/github.com/moby/swarmkit/v2/manager/csi/convert.go index 9df459f567..add7dae3e3 100644 --- a/vendor/github.com/docker/swarmkit/manager/csi/convert.go +++ b/vendor/github.com/moby/swarmkit/v2/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/vendor/github.com/docker/swarmkit/manager/csi/doc.go b/vendor/github.com/moby/swarmkit/v2/manager/csi/doc.go similarity index 100% rename from vendor/github.com/docker/swarmkit/manager/csi/doc.go rename to vendor/github.com/moby/swarmkit/v2/manager/csi/doc.go diff --git a/vendor/github.com/docker/swarmkit/manager/csi/manager.go b/vendor/github.com/moby/swarmkit/v2/manager/csi/manager.go similarity index 98% rename from vendor/github.com/docker/swarmkit/manager/csi/manager.go rename to vendor/github.com/moby/swarmkit/v2/manager/csi/manager.go index 509194ef7b..dc9862fc4f 100644 --- a/vendor/github.com/docker/swarmkit/manager/csi/manager.go +++ b/vendor/github.com/moby/swarmkit/v2/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/vendor/github.com/docker/swarmkit/manager/csi/plugin.go b/vendor/github.com/moby/swarmkit/v2/manager/csi/plugin.go similarity index 99% rename from vendor/github.com/docker/swarmkit/manager/csi/plugin.go rename to vendor/github.com/moby/swarmkit/v2/manager/csi/plugin.go index 6a52daa1ee..4fcb75c6d1 100644 --- a/vendor/github.com/docker/swarmkit/manager/csi/plugin.go +++ b/vendor/github.com/moby/swarmkit/v2/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/vendor/github.com/docker/swarmkit/manager/csi/secret.go b/vendor/github.com/moby/swarmkit/v2/manager/csi/secret.go similarity index 89% rename from vendor/github.com/docker/swarmkit/manager/csi/secret.go rename to vendor/github.com/moby/swarmkit/v2/manager/csi/secret.go index 7810f4ca15..46842d9782 100644 --- a/vendor/github.com/docker/swarmkit/manager/csi/secret.go +++ b/vendor/github.com/moby/swarmkit/v2/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/vendor/github.com/docker/swarmkit/manager/deks.go b/vendor/github.com/moby/swarmkit/v2/manager/deks.go similarity index 98% rename from vendor/github.com/docker/swarmkit/manager/deks.go rename to vendor/github.com/moby/swarmkit/v2/manager/deks.go index e556ff74ee..3249f61b55 100644 --- a/vendor/github.com/docker/swarmkit/manager/deks.go +++ b/vendor/github.com/moby/swarmkit/v2/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/vendor/github.com/docker/swarmkit/manager/dirty.go b/vendor/github.com/moby/swarmkit/v2/manager/dirty.go similarity index 95% rename from vendor/github.com/docker/swarmkit/manager/dirty.go rename to vendor/github.com/moby/swarmkit/v2/manager/dirty.go index c989ec2c86..1e65513654 100644 --- a/vendor/github.com/docker/swarmkit/manager/dirty.go +++ b/vendor/github.com/moby/swarmkit/v2/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/vendor/github.com/docker/swarmkit/manager/dispatcher/assignments.go b/vendor/github.com/moby/swarmkit/v2/manager/dispatcher/assignments.go similarity index 98% rename from vendor/github.com/docker/swarmkit/manager/dispatcher/assignments.go rename to vendor/github.com/moby/swarmkit/v2/manager/dispatcher/assignments.go index bd0f29872b..d398fa34b5 100644 --- a/vendor/github.com/docker/swarmkit/manager/dispatcher/assignments.go +++ b/vendor/github.com/moby/swarmkit/v2/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/vendor/github.com/docker/swarmkit/manager/dispatcher/dispatcher.go b/vendor/github.com/moby/swarmkit/v2/manager/dispatcher/dispatcher.go similarity index 99% rename from vendor/github.com/docker/swarmkit/manager/dispatcher/dispatcher.go rename to vendor/github.com/moby/swarmkit/v2/manager/dispatcher/dispatcher.go index af7d13b4a3..e9b30f29ba 100644 --- a/vendor/github.com/docker/swarmkit/manager/dispatcher/dispatcher.go +++ b/vendor/github.com/moby/swarmkit/v2/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/vendor/github.com/docker/swarmkit/manager/dispatcher/heartbeat/heartbeat.go b/vendor/github.com/moby/swarmkit/v2/manager/dispatcher/heartbeat/heartbeat.go similarity index 100% rename from vendor/github.com/docker/swarmkit/manager/dispatcher/heartbeat/heartbeat.go rename to vendor/github.com/moby/swarmkit/v2/manager/dispatcher/heartbeat/heartbeat.go diff --git a/vendor/github.com/docker/swarmkit/manager/dispatcher/nodes.go b/vendor/github.com/moby/swarmkit/v2/manager/dispatcher/nodes.go similarity index 97% rename from vendor/github.com/docker/swarmkit/manager/dispatcher/nodes.go rename to vendor/github.com/moby/swarmkit/v2/manager/dispatcher/nodes.go index fae6dc5f82..0f531e9497 100644 --- a/vendor/github.com/docker/swarmkit/manager/dispatcher/nodes.go +++ b/vendor/github.com/moby/swarmkit/v2/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/vendor/github.com/docker/swarmkit/manager/dispatcher/period.go b/vendor/github.com/moby/swarmkit/v2/manager/dispatcher/period.go similarity index 100% rename from vendor/github.com/docker/swarmkit/manager/dispatcher/period.go rename to vendor/github.com/moby/swarmkit/v2/manager/dispatcher/period.go diff --git a/vendor/github.com/docker/swarmkit/manager/doc.go b/vendor/github.com/moby/swarmkit/v2/manager/doc.go similarity index 100% rename from vendor/github.com/docker/swarmkit/manager/doc.go rename to vendor/github.com/moby/swarmkit/v2/manager/doc.go diff --git a/vendor/github.com/docker/swarmkit/manager/drivers/provider.go b/vendor/github.com/moby/swarmkit/v2/manager/drivers/provider.go similarity index 96% rename from vendor/github.com/docker/swarmkit/manager/drivers/provider.go rename to vendor/github.com/moby/swarmkit/v2/manager/drivers/provider.go index 97c36fe73d..899c54e1a7 100644 --- a/vendor/github.com/docker/swarmkit/manager/drivers/provider.go +++ b/vendor/github.com/moby/swarmkit/v2/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/vendor/github.com/docker/swarmkit/manager/drivers/secrets.go b/vendor/github.com/moby/swarmkit/v2/manager/drivers/secrets.go similarity index 98% rename from vendor/github.com/docker/swarmkit/manager/drivers/secrets.go rename to vendor/github.com/moby/swarmkit/v2/manager/drivers/secrets.go index 642d244690..ec221a4cb6 100644 --- a/vendor/github.com/docker/swarmkit/manager/drivers/secrets.go +++ b/vendor/github.com/moby/swarmkit/v2/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/vendor/github.com/docker/swarmkit/manager/encryption/encryption.go b/vendor/github.com/moby/swarmkit/v2/manager/encryption/encryption.go similarity index 99% rename from vendor/github.com/docker/swarmkit/manager/encryption/encryption.go rename to vendor/github.com/moby/swarmkit/v2/manager/encryption/encryption.go index 38ce091411..b458a84d46 100644 --- a/vendor/github.com/docker/swarmkit/manager/encryption/encryption.go +++ b/vendor/github.com/moby/swarmkit/v2/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/vendor/github.com/docker/swarmkit/manager/encryption/fernet.go b/vendor/github.com/moby/swarmkit/v2/manager/encryption/fernet.go similarity index 97% rename from vendor/github.com/docker/swarmkit/manager/encryption/fernet.go rename to vendor/github.com/moby/swarmkit/v2/manager/encryption/fernet.go index 09f418008a..fea08d2939 100644 --- a/vendor/github.com/docker/swarmkit/manager/encryption/fernet.go +++ b/vendor/github.com/moby/swarmkit/v2/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/vendor/github.com/docker/swarmkit/manager/encryption/nacl.go b/vendor/github.com/moby/swarmkit/v2/manager/encryption/nacl.go similarity index 98% rename from vendor/github.com/docker/swarmkit/manager/encryption/nacl.go rename to vendor/github.com/moby/swarmkit/v2/manager/encryption/nacl.go index 5fe6879f89..2928d1294a 100644 --- a/vendor/github.com/docker/swarmkit/manager/encryption/nacl.go +++ b/vendor/github.com/moby/swarmkit/v2/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/vendor/github.com/docker/swarmkit/manager/health/health.go b/vendor/github.com/moby/swarmkit/v2/manager/health/health.go similarity index 98% rename from vendor/github.com/docker/swarmkit/manager/health/health.go rename to vendor/github.com/moby/swarmkit/v2/manager/health/health.go index d75cbf4b60..4fd2adc541 100644 --- a/vendor/github.com/docker/swarmkit/manager/health/health.go +++ b/vendor/github.com/moby/swarmkit/v2/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/vendor/github.com/docker/swarmkit/manager/keymanager/keymanager.go b/vendor/github.com/moby/swarmkit/v2/manager/keymanager/keymanager.go similarity index 98% rename from vendor/github.com/docker/swarmkit/manager/keymanager/keymanager.go rename to vendor/github.com/moby/swarmkit/v2/manager/keymanager/keymanager.go index 7a5d7bf14d..cbbea32533 100644 --- a/vendor/github.com/docker/swarmkit/manager/keymanager/keymanager.go +++ b/vendor/github.com/moby/swarmkit/v2/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/vendor/github.com/docker/swarmkit/manager/logbroker/broker.go b/vendor/github.com/moby/swarmkit/v2/manager/logbroker/broker.go similarity index 97% rename from vendor/github.com/docker/swarmkit/manager/logbroker/broker.go rename to vendor/github.com/moby/swarmkit/v2/manager/logbroker/broker.go index c19438a27a..bce0cf152c 100644 --- a/vendor/github.com/docker/swarmkit/manager/logbroker/broker.go +++ b/vendor/github.com/moby/swarmkit/v2/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/vendor/github.com/docker/swarmkit/manager/logbroker/subscription.go b/vendor/github.com/moby/swarmkit/v2/manager/logbroker/subscription.go similarity index 96% rename from vendor/github.com/docker/swarmkit/manager/logbroker/subscription.go rename to vendor/github.com/moby/swarmkit/v2/manager/logbroker/subscription.go index 45295bb40a..7441ae50c6 100644 --- a/vendor/github.com/docker/swarmkit/manager/logbroker/subscription.go +++ b/vendor/github.com/moby/swarmkit/v2/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/vendor/github.com/docker/swarmkit/manager/manager.go b/vendor/github.com/moby/swarmkit/v2/manager/manager.go similarity index 96% rename from vendor/github.com/docker/swarmkit/manager/manager.go rename to vendor/github.com/moby/swarmkit/v2/manager/manager.go index 59895b1399..4bf219d0e4 100644 --- a/vendor/github.com/docker/swarmkit/manager/manager.go +++ b/vendor/github.com/moby/swarmkit/v2/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/vendor/github.com/docker/swarmkit/manager/metrics/collector.go b/vendor/github.com/moby/swarmkit/v2/manager/metrics/collector.go similarity index 98% rename from vendor/github.com/docker/swarmkit/manager/metrics/collector.go rename to vendor/github.com/moby/swarmkit/v2/manager/metrics/collector.go index 5539a898ca..00e5690304 100644 --- a/vendor/github.com/docker/swarmkit/manager/metrics/collector.go +++ b/vendor/github.com/moby/swarmkit/v2/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/vendor/github.com/docker/swarmkit/manager/orchestrator/constraintenforcer/constraint_enforcer.go b/vendor/github.com/moby/swarmkit/v2/manager/orchestrator/constraintenforcer/constraint_enforcer.go similarity index 95% rename from vendor/github.com/docker/swarmkit/manager/orchestrator/constraintenforcer/constraint_enforcer.go rename to vendor/github.com/moby/swarmkit/v2/manager/orchestrator/constraintenforcer/constraint_enforcer.go index 6b179de3f7..5faae5a025 100644 --- a/vendor/github.com/docker/swarmkit/manager/orchestrator/constraintenforcer/constraint_enforcer.go +++ b/vendor/github.com/moby/swarmkit/v2/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/vendor/github.com/docker/swarmkit/manager/orchestrator/global/global.go b/vendor/github.com/moby/swarmkit/v2/manager/orchestrator/global/global.go similarity index 97% rename from vendor/github.com/docker/swarmkit/manager/orchestrator/global/global.go rename to vendor/github.com/moby/swarmkit/v2/manager/orchestrator/global/global.go index 715781e817..71c5bae13f 100644 --- a/vendor/github.com/docker/swarmkit/manager/orchestrator/global/global.go +++ b/vendor/github.com/moby/swarmkit/v2/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/vendor/github.com/docker/swarmkit/manager/orchestrator/jobs/global/reconciler.go b/vendor/github.com/moby/swarmkit/v2/manager/orchestrator/jobs/global/reconciler.go similarity index 98% rename from vendor/github.com/docker/swarmkit/manager/orchestrator/jobs/global/reconciler.go rename to vendor/github.com/moby/swarmkit/v2/manager/orchestrator/jobs/global/reconciler.go index 00e95804c3..09e84b9f04 100644 --- a/vendor/github.com/docker/swarmkit/manager/orchestrator/jobs/global/reconciler.go +++ b/vendor/github.com/moby/swarmkit/v2/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/vendor/github.com/docker/swarmkit/manager/orchestrator/jobs/orchestrator.go b/vendor/github.com/moby/swarmkit/v2/manager/orchestrator/jobs/orchestrator.go similarity index 95% rename from vendor/github.com/docker/swarmkit/manager/orchestrator/jobs/orchestrator.go rename to vendor/github.com/moby/swarmkit/v2/manager/orchestrator/jobs/orchestrator.go index d244d3c65b..5bf366e53d 100644 --- a/vendor/github.com/docker/swarmkit/manager/orchestrator/jobs/orchestrator.go +++ b/vendor/github.com/moby/swarmkit/v2/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/vendor/github.com/docker/swarmkit/manager/orchestrator/jobs/replicated/reconciler.go b/vendor/github.com/moby/swarmkit/v2/manager/orchestrator/jobs/replicated/reconciler.go similarity index 98% rename from vendor/github.com/docker/swarmkit/manager/orchestrator/jobs/replicated/reconciler.go rename to vendor/github.com/moby/swarmkit/v2/manager/orchestrator/jobs/replicated/reconciler.go index 886ac8d91e..949bbff0dc 100644 --- a/vendor/github.com/docker/swarmkit/manager/orchestrator/jobs/replicated/reconciler.go +++ b/vendor/github.com/moby/swarmkit/v2/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/vendor/github.com/docker/swarmkit/manager/orchestrator/replicated/replicated.go b/vendor/github.com/moby/swarmkit/v2/manager/orchestrator/replicated/replicated.go similarity index 90% rename from vendor/github.com/docker/swarmkit/manager/orchestrator/replicated/replicated.go rename to vendor/github.com/moby/swarmkit/v2/manager/orchestrator/replicated/replicated.go index dc45528682..e3eb2574ac 100644 --- a/vendor/github.com/docker/swarmkit/manager/orchestrator/replicated/replicated.go +++ b/vendor/github.com/moby/swarmkit/v2/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/vendor/github.com/docker/swarmkit/manager/orchestrator/replicated/services.go b/vendor/github.com/moby/swarmkit/v2/manager/orchestrator/replicated/services.go similarity index 98% rename from vendor/github.com/docker/swarmkit/manager/orchestrator/replicated/services.go rename to vendor/github.com/moby/swarmkit/v2/manager/orchestrator/replicated/services.go index b5e6bb12e8..fa4463b276 100644 --- a/vendor/github.com/docker/swarmkit/manager/orchestrator/replicated/services.go +++ b/vendor/github.com/moby/swarmkit/v2/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/vendor/github.com/docker/swarmkit/manager/orchestrator/replicated/slot.go b/vendor/github.com/moby/swarmkit/v2/manager/orchestrator/replicated/slot.go similarity index 95% rename from vendor/github.com/docker/swarmkit/manager/orchestrator/replicated/slot.go rename to vendor/github.com/moby/swarmkit/v2/manager/orchestrator/replicated/slot.go index 1160d4c96c..0009505cc7 100644 --- a/vendor/github.com/docker/swarmkit/manager/orchestrator/replicated/slot.go +++ b/vendor/github.com/moby/swarmkit/v2/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/vendor/github.com/docker/swarmkit/manager/orchestrator/replicated/tasks.go b/vendor/github.com/moby/swarmkit/v2/manager/orchestrator/replicated/tasks.go similarity index 95% rename from vendor/github.com/docker/swarmkit/manager/orchestrator/replicated/tasks.go rename to vendor/github.com/moby/swarmkit/v2/manager/orchestrator/replicated/tasks.go index b6336aa88a..8f3d203170 100644 --- a/vendor/github.com/docker/swarmkit/manager/orchestrator/replicated/tasks.go +++ b/vendor/github.com/moby/swarmkit/v2/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/vendor/github.com/docker/swarmkit/manager/orchestrator/restart/restart.go b/vendor/github.com/moby/swarmkit/v2/manager/orchestrator/restart/restart.go similarity index 98% rename from vendor/github.com/docker/swarmkit/manager/orchestrator/restart/restart.go rename to vendor/github.com/moby/swarmkit/v2/manager/orchestrator/restart/restart.go index 44e1309f6c..d38a5bb33f 100644 --- a/vendor/github.com/docker/swarmkit/manager/orchestrator/restart/restart.go +++ b/vendor/github.com/moby/swarmkit/v2/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/vendor/github.com/docker/swarmkit/manager/orchestrator/service.go b/vendor/github.com/moby/swarmkit/v2/manager/orchestrator/service.go similarity index 96% rename from vendor/github.com/docker/swarmkit/manager/orchestrator/service.go rename to vendor/github.com/moby/swarmkit/v2/manager/orchestrator/service.go index adc5181b50..476433e5d1 100644 --- a/vendor/github.com/docker/swarmkit/manager/orchestrator/service.go +++ b/vendor/github.com/moby/swarmkit/v2/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/vendor/github.com/docker/swarmkit/manager/orchestrator/slot.go b/vendor/github.com/moby/swarmkit/v2/manager/orchestrator/slot.go similarity index 95% rename from vendor/github.com/docker/swarmkit/manager/orchestrator/slot.go rename to vendor/github.com/moby/swarmkit/v2/manager/orchestrator/slot.go index 7839a7509c..f585fdf46d 100644 --- a/vendor/github.com/docker/swarmkit/manager/orchestrator/slot.go +++ b/vendor/github.com/moby/swarmkit/v2/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/vendor/github.com/docker/swarmkit/manager/orchestrator/task.go b/vendor/github.com/moby/swarmkit/v2/manager/orchestrator/task.go similarity index 96% rename from vendor/github.com/docker/swarmkit/manager/orchestrator/task.go rename to vendor/github.com/moby/swarmkit/v2/manager/orchestrator/task.go index f9a3feadf5..0c0b54dcda 100644 --- a/vendor/github.com/docker/swarmkit/manager/orchestrator/task.go +++ b/vendor/github.com/moby/swarmkit/v2/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/vendor/github.com/docker/swarmkit/manager/orchestrator/taskinit/init.go b/vendor/github.com/moby/swarmkit/v2/manager/orchestrator/taskinit/init.go similarity index 94% rename from vendor/github.com/docker/swarmkit/manager/orchestrator/taskinit/init.go rename to vendor/github.com/moby/swarmkit/v2/manager/orchestrator/taskinit/init.go index 5636c3c699..5098d70a8a 100644 --- a/vendor/github.com/docker/swarmkit/manager/orchestrator/taskinit/init.go +++ b/vendor/github.com/moby/swarmkit/v2/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/vendor/github.com/docker/swarmkit/manager/orchestrator/taskreaper/task_reaper.go b/vendor/github.com/moby/swarmkit/v2/manager/orchestrator/taskreaper/task_reaper.go similarity index 98% rename from vendor/github.com/docker/swarmkit/manager/orchestrator/taskreaper/task_reaper.go rename to vendor/github.com/moby/swarmkit/v2/manager/orchestrator/taskreaper/task_reaper.go index 7fdb0a65d0..43f090bc8c 100644 --- a/vendor/github.com/docker/swarmkit/manager/orchestrator/taskreaper/task_reaper.go +++ b/vendor/github.com/moby/swarmkit/v2/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/vendor/github.com/docker/swarmkit/manager/orchestrator/update/updater.go b/vendor/github.com/moby/swarmkit/v2/manager/orchestrator/update/updater.go similarity index 97% rename from vendor/github.com/docker/swarmkit/manager/orchestrator/update/updater.go rename to vendor/github.com/moby/swarmkit/v2/manager/orchestrator/update/updater.go index e181a4ffa2..ba9a996212 100644 --- a/vendor/github.com/docker/swarmkit/manager/orchestrator/update/updater.go +++ b/vendor/github.com/moby/swarmkit/v2/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/vendor/github.com/docker/swarmkit/manager/orchestrator/volumeenforcer/volume_enforcer.go b/vendor/github.com/moby/swarmkit/v2/manager/orchestrator/volumeenforcer/volume_enforcer.go similarity index 96% rename from vendor/github.com/docker/swarmkit/manager/orchestrator/volumeenforcer/volume_enforcer.go rename to vendor/github.com/moby/swarmkit/v2/manager/orchestrator/volumeenforcer/volume_enforcer.go index f9de16f303..48357dd619 100644 --- a/vendor/github.com/docker/swarmkit/manager/orchestrator/volumeenforcer/volume_enforcer.go +++ b/vendor/github.com/moby/swarmkit/v2/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/vendor/github.com/docker/swarmkit/manager/raftselector/raftselector.go b/vendor/github.com/moby/swarmkit/v2/manager/raftselector/raftselector.go similarity index 100% rename from vendor/github.com/docker/swarmkit/manager/raftselector/raftselector.go rename to vendor/github.com/moby/swarmkit/v2/manager/raftselector/raftselector.go diff --git a/vendor/github.com/docker/swarmkit/manager/resourceapi/allocator.go b/vendor/github.com/moby/swarmkit/v2/manager/resourceapi/allocator.go similarity index 94% rename from vendor/github.com/docker/swarmkit/manager/resourceapi/allocator.go rename to vendor/github.com/moby/swarmkit/v2/manager/resourceapi/allocator.go index 545e4ded99..b8d876ab7c 100644 --- a/vendor/github.com/docker/swarmkit/manager/resourceapi/allocator.go +++ b/vendor/github.com/moby/swarmkit/v2/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/vendor/github.com/docker/swarmkit/manager/role_manager.go b/vendor/github.com/moby/swarmkit/v2/manager/role_manager.go similarity index 97% rename from vendor/github.com/docker/swarmkit/manager/role_manager.go rename to vendor/github.com/moby/swarmkit/v2/manager/role_manager.go index e5901525b9..54323de981 100644 --- a/vendor/github.com/docker/swarmkit/manager/role_manager.go +++ b/vendor/github.com/moby/swarmkit/v2/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/vendor/github.com/docker/swarmkit/manager/scheduler/decision_tree.go b/vendor/github.com/moby/swarmkit/v2/manager/scheduler/decision_tree.go similarity index 100% rename from vendor/github.com/docker/swarmkit/manager/scheduler/decision_tree.go rename to vendor/github.com/moby/swarmkit/v2/manager/scheduler/decision_tree.go diff --git a/vendor/github.com/docker/swarmkit/manager/scheduler/filter.go b/vendor/github.com/moby/swarmkit/v2/manager/scheduler/filter.go similarity index 98% rename from vendor/github.com/docker/swarmkit/manager/scheduler/filter.go rename to vendor/github.com/moby/swarmkit/v2/manager/scheduler/filter.go index 979329e3d4..a7db0dbcdf 100644 --- a/vendor/github.com/docker/swarmkit/manager/scheduler/filter.go +++ b/vendor/github.com/moby/swarmkit/v2/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/vendor/github.com/docker/swarmkit/manager/scheduler/nodeheap.go b/vendor/github.com/moby/swarmkit/v2/manager/scheduler/nodeheap.go similarity index 100% rename from vendor/github.com/docker/swarmkit/manager/scheduler/nodeheap.go rename to vendor/github.com/moby/swarmkit/v2/manager/scheduler/nodeheap.go diff --git a/vendor/github.com/docker/swarmkit/manager/scheduler/nodeinfo.go b/vendor/github.com/moby/swarmkit/v2/manager/scheduler/nodeinfo.go similarity index 98% rename from vendor/github.com/docker/swarmkit/manager/scheduler/nodeinfo.go rename to vendor/github.com/moby/swarmkit/v2/manager/scheduler/nodeinfo.go index a854ab63e6..a328bae34d 100644 --- a/vendor/github.com/docker/swarmkit/manager/scheduler/nodeinfo.go +++ b/vendor/github.com/moby/swarmkit/v2/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/vendor/github.com/docker/swarmkit/manager/scheduler/nodeset.go b/vendor/github.com/moby/swarmkit/v2/manager/scheduler/nodeset.go similarity index 97% rename from vendor/github.com/docker/swarmkit/manager/scheduler/nodeset.go rename to vendor/github.com/moby/swarmkit/v2/manager/scheduler/nodeset.go index b83704a18d..ba06f1dfc3 100644 --- a/vendor/github.com/docker/swarmkit/manager/scheduler/nodeset.go +++ b/vendor/github.com/moby/swarmkit/v2/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/vendor/github.com/docker/swarmkit/manager/scheduler/pipeline.go b/vendor/github.com/moby/swarmkit/v2/manager/scheduler/pipeline.go similarity index 98% rename from vendor/github.com/docker/swarmkit/manager/scheduler/pipeline.go rename to vendor/github.com/moby/swarmkit/v2/manager/scheduler/pipeline.go index ba6ef05d9f..71256eeb85 100644 --- a/vendor/github.com/docker/swarmkit/manager/scheduler/pipeline.go +++ b/vendor/github.com/moby/swarmkit/v2/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/vendor/github.com/docker/swarmkit/manager/scheduler/scheduler.go b/vendor/github.com/moby/swarmkit/v2/manager/scheduler/scheduler.go similarity index 99% rename from vendor/github.com/docker/swarmkit/manager/scheduler/scheduler.go rename to vendor/github.com/moby/swarmkit/v2/manager/scheduler/scheduler.go index 4638ec1831..27995a5f49 100644 --- a/vendor/github.com/docker/swarmkit/manager/scheduler/scheduler.go +++ b/vendor/github.com/moby/swarmkit/v2/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/vendor/github.com/docker/swarmkit/manager/scheduler/topology.go b/vendor/github.com/moby/swarmkit/v2/manager/scheduler/topology.go similarity index 98% rename from vendor/github.com/docker/swarmkit/manager/scheduler/topology.go rename to vendor/github.com/moby/swarmkit/v2/manager/scheduler/topology.go index 05c3ad8884..8661fc6372 100644 --- a/vendor/github.com/docker/swarmkit/manager/scheduler/topology.go +++ b/vendor/github.com/moby/swarmkit/v2/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/vendor/github.com/docker/swarmkit/manager/scheduler/volumes.go b/vendor/github.com/moby/swarmkit/v2/manager/scheduler/volumes.go similarity index 99% rename from vendor/github.com/docker/swarmkit/manager/scheduler/volumes.go rename to vendor/github.com/moby/swarmkit/v2/manager/scheduler/volumes.go index 769ff576d3..ee2137acbc 100644 --- a/vendor/github.com/docker/swarmkit/manager/scheduler/volumes.go +++ b/vendor/github.com/moby/swarmkit/v2/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/vendor/github.com/docker/swarmkit/manager/state/proposer.go b/vendor/github.com/moby/swarmkit/v2/manager/state/proposer.go similarity index 96% rename from vendor/github.com/docker/swarmkit/manager/state/proposer.go rename to vendor/github.com/moby/swarmkit/v2/manager/state/proposer.go index 8d53f5772f..79aabdcef7 100644 --- a/vendor/github.com/docker/swarmkit/manager/state/proposer.go +++ b/vendor/github.com/moby/swarmkit/v2/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/vendor/github.com/docker/swarmkit/manager/state/raft/membership/cluster.go b/vendor/github.com/moby/swarmkit/v2/manager/state/raft/membership/cluster.go similarity index 98% rename from vendor/github.com/docker/swarmkit/manager/state/raft/membership/cluster.go rename to vendor/github.com/moby/swarmkit/v2/manager/state/raft/membership/cluster.go index ace8060bc6..062d8aa526 100644 --- a/vendor/github.com/docker/swarmkit/manager/state/raft/membership/cluster.go +++ b/vendor/github.com/moby/swarmkit/v2/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/vendor/github.com/docker/swarmkit/manager/state/raft/raft.go b/vendor/github.com/moby/swarmkit/v2/manager/state/raft/raft.go similarity index 99% rename from vendor/github.com/docker/swarmkit/manager/state/raft/raft.go rename to vendor/github.com/moby/swarmkit/v2/manager/state/raft/raft.go index 31912fcb0e..60407a8b2c 100644 --- a/vendor/github.com/docker/swarmkit/manager/state/raft/raft.go +++ b/vendor/github.com/moby/swarmkit/v2/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/vendor/github.com/docker/swarmkit/manager/state/raft/storage.go b/vendor/github.com/moby/swarmkit/v2/manager/state/raft/storage.go similarity index 96% rename from vendor/github.com/docker/swarmkit/manager/state/raft/storage.go rename to vendor/github.com/moby/swarmkit/v2/manager/state/raft/storage.go index 07b687706e..28f4102ac2 100644 --- a/vendor/github.com/docker/swarmkit/manager/state/raft/storage.go +++ b/vendor/github.com/moby/swarmkit/v2/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/vendor/github.com/docker/swarmkit/manager/state/raft/storage/snapwrap.go b/vendor/github.com/moby/swarmkit/v2/manager/state/raft/storage/snapwrap.go similarity index 98% rename from vendor/github.com/docker/swarmkit/manager/state/raft/storage/snapwrap.go rename to vendor/github.com/moby/swarmkit/v2/manager/state/raft/storage/snapwrap.go index 5819df6296..02f9afea7f 100644 --- a/vendor/github.com/docker/swarmkit/manager/state/raft/storage/snapwrap.go +++ b/vendor/github.com/moby/swarmkit/v2/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/vendor/github.com/docker/swarmkit/manager/state/raft/storage/storage.go b/vendor/github.com/moby/swarmkit/v2/manager/state/raft/storage/storage.go similarity index 99% rename from vendor/github.com/docker/swarmkit/manager/state/raft/storage/storage.go rename to vendor/github.com/moby/swarmkit/v2/manager/state/raft/storage/storage.go index 347d7db7f8..8e7476156f 100644 --- a/vendor/github.com/docker/swarmkit/manager/state/raft/storage/storage.go +++ b/vendor/github.com/moby/swarmkit/v2/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/vendor/github.com/docker/swarmkit/manager/state/raft/storage/walwrap.go b/vendor/github.com/moby/swarmkit/v2/manager/state/raft/storage/walwrap.go similarity index 98% rename from vendor/github.com/docker/swarmkit/manager/state/raft/storage/walwrap.go rename to vendor/github.com/moby/swarmkit/v2/manager/state/raft/storage/walwrap.go index 13eab9a19a..2fd0a91804 100644 --- a/vendor/github.com/docker/swarmkit/manager/state/raft/storage/walwrap.go +++ b/vendor/github.com/moby/swarmkit/v2/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/vendor/github.com/docker/swarmkit/manager/state/raft/transport/peer.go b/vendor/github.com/moby/swarmkit/v2/manager/state/raft/transport/peer.go similarity index 98% rename from vendor/github.com/docker/swarmkit/manager/state/raft/transport/peer.go rename to vendor/github.com/moby/swarmkit/v2/manager/state/raft/transport/peer.go index 5e98a9915d..237b871619 100644 --- a/vendor/github.com/docker/swarmkit/manager/state/raft/transport/peer.go +++ b/vendor/github.com/moby/swarmkit/v2/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/vendor/github.com/docker/swarmkit/manager/state/raft/transport/transport.go b/vendor/github.com/moby/swarmkit/v2/manager/state/raft/transport/transport.go similarity index 99% rename from vendor/github.com/docker/swarmkit/manager/state/raft/transport/transport.go rename to vendor/github.com/moby/swarmkit/v2/manager/state/raft/transport/transport.go index f752b092ad..a2bc5a7e2f 100644 --- a/vendor/github.com/docker/swarmkit/manager/state/raft/transport/transport.go +++ b/vendor/github.com/moby/swarmkit/v2/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/vendor/github.com/docker/swarmkit/manager/state/raft/util.go b/vendor/github.com/moby/swarmkit/v2/manager/state/raft/util.go similarity index 94% rename from vendor/github.com/docker/swarmkit/manager/state/raft/util.go rename to vendor/github.com/moby/swarmkit/v2/manager/state/raft/util.go index 1a49f76cb4..423831527c 100644 --- a/vendor/github.com/docker/swarmkit/manager/state/raft/util.go +++ b/vendor/github.com/moby/swarmkit/v2/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/vendor/github.com/docker/swarmkit/manager/state/raft/wait.go b/vendor/github.com/moby/swarmkit/v2/manager/state/raft/wait.go similarity index 100% rename from vendor/github.com/docker/swarmkit/manager/state/raft/wait.go rename to vendor/github.com/moby/swarmkit/v2/manager/state/raft/wait.go diff --git a/vendor/github.com/docker/swarmkit/manager/state/store/apply.go b/vendor/github.com/moby/swarmkit/v2/manager/state/store/apply.go similarity index 93% rename from vendor/github.com/docker/swarmkit/manager/state/store/apply.go rename to vendor/github.com/moby/swarmkit/v2/manager/state/store/apply.go index e5f5c494e4..6432ccf9d1 100644 --- a/vendor/github.com/docker/swarmkit/manager/state/store/apply.go +++ b/vendor/github.com/moby/swarmkit/v2/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/vendor/github.com/docker/swarmkit/manager/state/store/by.go b/vendor/github.com/moby/swarmkit/v2/manager/state/store/by.go similarity index 99% rename from vendor/github.com/docker/swarmkit/manager/state/store/by.go rename to vendor/github.com/moby/swarmkit/v2/manager/state/store/by.go index 59672410af..a26ea3f742 100644 --- a/vendor/github.com/docker/swarmkit/manager/state/store/by.go +++ b/vendor/github.com/moby/swarmkit/v2/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/vendor/github.com/docker/swarmkit/manager/state/store/clusters.go b/vendor/github.com/moby/swarmkit/v2/manager/state/store/clusters.go similarity index 98% rename from vendor/github.com/docker/swarmkit/manager/state/store/clusters.go rename to vendor/github.com/moby/swarmkit/v2/manager/state/store/clusters.go index 495fc04037..bf5f1da8f1 100644 --- a/vendor/github.com/docker/swarmkit/manager/state/store/clusters.go +++ b/vendor/github.com/moby/swarmkit/v2/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/vendor/github.com/docker/swarmkit/manager/state/store/combinators.go b/vendor/github.com/moby/swarmkit/v2/manager/state/store/combinators.go similarity index 100% rename from vendor/github.com/docker/swarmkit/manager/state/store/combinators.go rename to vendor/github.com/moby/swarmkit/v2/manager/state/store/combinators.go diff --git a/vendor/github.com/docker/swarmkit/manager/state/store/configs.go b/vendor/github.com/moby/swarmkit/v2/manager/state/store/configs.go similarity index 98% rename from vendor/github.com/docker/swarmkit/manager/state/store/configs.go rename to vendor/github.com/moby/swarmkit/v2/manager/state/store/configs.go index d02e04ba9b..5805ca4579 100644 --- a/vendor/github.com/docker/swarmkit/manager/state/store/configs.go +++ b/vendor/github.com/moby/swarmkit/v2/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/vendor/github.com/docker/swarmkit/manager/state/store/doc.go b/vendor/github.com/moby/swarmkit/v2/manager/state/store/doc.go similarity index 100% rename from vendor/github.com/docker/swarmkit/manager/state/store/doc.go rename to vendor/github.com/moby/swarmkit/v2/manager/state/store/doc.go diff --git a/vendor/github.com/docker/swarmkit/manager/state/store/extensions.go b/vendor/github.com/moby/swarmkit/v2/manager/state/store/extensions.go similarity index 99% rename from vendor/github.com/docker/swarmkit/manager/state/store/extensions.go rename to vendor/github.com/moby/swarmkit/v2/manager/state/store/extensions.go index 8dac4baac7..eb215852df 100644 --- a/vendor/github.com/docker/swarmkit/manager/state/store/extensions.go +++ b/vendor/github.com/moby/swarmkit/v2/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/vendor/github.com/docker/swarmkit/manager/state/store/memory.go b/vendor/github.com/moby/swarmkit/v2/manager/state/store/memory.go similarity index 96% rename from vendor/github.com/docker/swarmkit/manager/state/store/memory.go rename to vendor/github.com/moby/swarmkit/v2/manager/state/store/memory.go index 3b3f28a263..e1b63508d2 100644 --- a/vendor/github.com/docker/swarmkit/manager/state/store/memory.go +++ b/vendor/github.com/moby/swarmkit/v2/manager/state/store/memory.go @@ -13,12 +13,12 @@ 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" 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" ) 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 } diff --git a/vendor/github.com/docker/swarmkit/manager/state/store/networks.go b/vendor/github.com/moby/swarmkit/v2/manager/state/store/networks.go similarity index 98% rename from vendor/github.com/docker/swarmkit/manager/state/store/networks.go rename to vendor/github.com/moby/swarmkit/v2/manager/state/store/networks.go index fa887b3b11..4b3bcfb86a 100644 --- a/vendor/github.com/docker/swarmkit/manager/state/store/networks.go +++ b/vendor/github.com/moby/swarmkit/v2/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/vendor/github.com/docker/swarmkit/manager/state/store/nodes.go b/vendor/github.com/moby/swarmkit/v2/manager/state/store/nodes.go similarity index 99% rename from vendor/github.com/docker/swarmkit/manager/state/store/nodes.go rename to vendor/github.com/moby/swarmkit/v2/manager/state/store/nodes.go index fa6ae85bd7..1a81bb9ec1 100644 --- a/vendor/github.com/docker/swarmkit/manager/state/store/nodes.go +++ b/vendor/github.com/moby/swarmkit/v2/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/vendor/github.com/docker/swarmkit/manager/state/store/object.go b/vendor/github.com/moby/swarmkit/v2/manager/state/store/object.go similarity index 97% rename from vendor/github.com/docker/swarmkit/manager/state/store/object.go rename to vendor/github.com/moby/swarmkit/v2/manager/state/store/object.go index 89029afb9f..e951843c12 100644 --- a/vendor/github.com/docker/swarmkit/manager/state/store/object.go +++ b/vendor/github.com/moby/swarmkit/v2/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/vendor/github.com/docker/swarmkit/manager/state/store/resources.go b/vendor/github.com/moby/swarmkit/v2/manager/state/store/resources.go similarity index 99% rename from vendor/github.com/docker/swarmkit/manager/state/store/resources.go rename to vendor/github.com/moby/swarmkit/v2/manager/state/store/resources.go index 9852f64fe0..537d71261c 100644 --- a/vendor/github.com/docker/swarmkit/manager/state/store/resources.go +++ b/vendor/github.com/moby/swarmkit/v2/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/vendor/github.com/docker/swarmkit/manager/state/store/secrets.go b/vendor/github.com/moby/swarmkit/v2/manager/state/store/secrets.go similarity index 98% rename from vendor/github.com/docker/swarmkit/manager/state/store/secrets.go rename to vendor/github.com/moby/swarmkit/v2/manager/state/store/secrets.go index bf5653fd72..4271011882 100644 --- a/vendor/github.com/docker/swarmkit/manager/state/store/secrets.go +++ b/vendor/github.com/moby/swarmkit/v2/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/vendor/github.com/docker/swarmkit/manager/state/store/services.go b/vendor/github.com/moby/swarmkit/v2/manager/state/store/services.go similarity index 98% rename from vendor/github.com/docker/swarmkit/manager/state/store/services.go rename to vendor/github.com/moby/swarmkit/v2/manager/state/store/services.go index a581737369..6cd03b082c 100644 --- a/vendor/github.com/docker/swarmkit/manager/state/store/services.go +++ b/vendor/github.com/moby/swarmkit/v2/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/vendor/github.com/docker/swarmkit/manager/state/store/tasks.go b/vendor/github.com/moby/swarmkit/v2/manager/state/store/tasks.go similarity index 99% rename from vendor/github.com/docker/swarmkit/manager/state/store/tasks.go rename to vendor/github.com/moby/swarmkit/v2/manager/state/store/tasks.go index 4385e48e55..3097b40c63 100644 --- a/vendor/github.com/docker/swarmkit/manager/state/store/tasks.go +++ b/vendor/github.com/moby/swarmkit/v2/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/vendor/github.com/docker/swarmkit/manager/state/store/volumes.go b/vendor/github.com/moby/swarmkit/v2/manager/state/store/volumes.go similarity index 99% rename from vendor/github.com/docker/swarmkit/manager/state/store/volumes.go rename to vendor/github.com/moby/swarmkit/v2/manager/state/store/volumes.go index 9f3195c135..444d50cc0f 100644 --- a/vendor/github.com/docker/swarmkit/manager/state/store/volumes.go +++ b/vendor/github.com/moby/swarmkit/v2/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/vendor/github.com/docker/swarmkit/manager/state/watch.go b/vendor/github.com/moby/swarmkit/v2/manager/state/watch.go similarity index 97% rename from vendor/github.com/docker/swarmkit/manager/state/watch.go rename to vendor/github.com/moby/swarmkit/v2/manager/state/watch.go index ad0ebd75fa..183c8964ee 100644 --- a/vendor/github.com/docker/swarmkit/manager/state/watch.go +++ b/vendor/github.com/moby/swarmkit/v2/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/vendor/github.com/docker/swarmkit/manager/watchapi/server.go b/vendor/github.com/moby/swarmkit/v2/manager/watchapi/server.go similarity index 94% rename from vendor/github.com/docker/swarmkit/manager/watchapi/server.go rename to vendor/github.com/moby/swarmkit/v2/manager/watchapi/server.go index eb086b8ac0..128d2a20d8 100644 --- a/vendor/github.com/docker/swarmkit/manager/watchapi/server.go +++ b/vendor/github.com/moby/swarmkit/v2/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/vendor/github.com/docker/swarmkit/manager/watchapi/watch.go b/vendor/github.com/moby/swarmkit/v2/manager/watchapi/watch.go similarity index 92% rename from vendor/github.com/docker/swarmkit/manager/watchapi/watch.go rename to vendor/github.com/moby/swarmkit/v2/manager/watchapi/watch.go index 223dcb55d6..2fe526d79d 100644 --- a/vendor/github.com/docker/swarmkit/manager/watchapi/watch.go +++ b/vendor/github.com/moby/swarmkit/v2/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/vendor/github.com/docker/swarmkit/node/node.go b/vendor/github.com/moby/swarmkit/v2/node/node.go similarity index 98% rename from vendor/github.com/docker/swarmkit/node/node.go rename to vendor/github.com/moby/swarmkit/v2/node/node.go index c467a6c8d6..439e8757ba 100644 --- a/vendor/github.com/docker/swarmkit/node/node.go +++ b/vendor/github.com/moby/swarmkit/v2/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/vendor/github.com/docker/swarmkit/protobuf/plugin/helpers.go b/vendor/github.com/moby/swarmkit/v2/protobuf/plugin/helpers.go similarity index 100% rename from vendor/github.com/docker/swarmkit/protobuf/plugin/helpers.go rename to vendor/github.com/moby/swarmkit/v2/protobuf/plugin/helpers.go diff --git a/vendor/github.com/docker/swarmkit/protobuf/plugin/plugin.pb.go b/vendor/github.com/moby/swarmkit/v2/protobuf/plugin/plugin.pb.go similarity index 99% rename from vendor/github.com/docker/swarmkit/protobuf/plugin/plugin.pb.go rename to vendor/github.com/moby/swarmkit/v2/protobuf/plugin/plugin.pb.go index 1ff8cdc382..d947c8b530 100644 --- a/vendor/github.com/docker/swarmkit/protobuf/plugin/plugin.pb.go +++ b/vendor/github.com/moby/swarmkit/v2/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/vendor/github.com/docker/swarmkit/protobuf/plugin/plugin.proto b/vendor/github.com/moby/swarmkit/v2/protobuf/plugin/plugin.proto similarity index 100% rename from vendor/github.com/docker/swarmkit/protobuf/plugin/plugin.proto rename to vendor/github.com/moby/swarmkit/v2/protobuf/plugin/plugin.proto diff --git a/vendor/github.com/docker/swarmkit/protobuf/ptypes/doc.go b/vendor/github.com/moby/swarmkit/v2/protobuf/ptypes/doc.go similarity index 100% rename from vendor/github.com/docker/swarmkit/protobuf/ptypes/doc.go rename to vendor/github.com/moby/swarmkit/v2/protobuf/ptypes/doc.go diff --git a/vendor/github.com/docker/swarmkit/protobuf/ptypes/timestamp.go b/vendor/github.com/moby/swarmkit/v2/protobuf/ptypes/timestamp.go similarity index 100% rename from vendor/github.com/docker/swarmkit/protobuf/ptypes/timestamp.go rename to vendor/github.com/moby/swarmkit/v2/protobuf/ptypes/timestamp.go diff --git a/vendor/github.com/docker/swarmkit/remotes/remotes.go b/vendor/github.com/moby/swarmkit/v2/remotes/remotes.go similarity index 99% rename from vendor/github.com/docker/swarmkit/remotes/remotes.go rename to vendor/github.com/moby/swarmkit/v2/remotes/remotes.go index e79ed3f326..c31e1abb49 100644 --- a/vendor/github.com/docker/swarmkit/remotes/remotes.go +++ b/vendor/github.com/moby/swarmkit/v2/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/vendor/github.com/docker/swarmkit/template/context.go b/vendor/github.com/moby/swarmkit/v2/template/context.go similarity index 96% rename from vendor/github.com/docker/swarmkit/template/context.go rename to vendor/github.com/moby/swarmkit/v2/template/context.go index 8485fc4628..b1d995e994 100644 --- a/vendor/github.com/docker/swarmkit/template/context.go +++ b/vendor/github.com/moby/swarmkit/v2/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/vendor/github.com/docker/swarmkit/template/expand.go b/vendor/github.com/moby/swarmkit/v2/template/expand.go similarity index 98% rename from vendor/github.com/docker/swarmkit/template/expand.go rename to vendor/github.com/moby/swarmkit/v2/template/expand.go index 0957c25f20..13a7add036 100644 --- a/vendor/github.com/docker/swarmkit/template/expand.go +++ b/vendor/github.com/moby/swarmkit/v2/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/vendor/github.com/docker/swarmkit/template/getter.go b/vendor/github.com/moby/swarmkit/v2/template/getter.go similarity index 98% rename from vendor/github.com/docker/swarmkit/template/getter.go rename to vendor/github.com/moby/swarmkit/v2/template/getter.go index 41409c7400..e8344735db 100644 --- a/vendor/github.com/docker/swarmkit/template/getter.go +++ b/vendor/github.com/moby/swarmkit/v2/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/vendor/github.com/docker/swarmkit/template/template.go b/vendor/github.com/moby/swarmkit/v2/template/template.go similarity index 100% rename from vendor/github.com/docker/swarmkit/template/template.go rename to vendor/github.com/moby/swarmkit/v2/template/template.go diff --git a/vendor/github.com/docker/swarmkit/volumequeue/doc.go b/vendor/github.com/moby/swarmkit/v2/volumequeue/doc.go similarity index 100% rename from vendor/github.com/docker/swarmkit/volumequeue/doc.go rename to vendor/github.com/moby/swarmkit/v2/volumequeue/doc.go diff --git a/vendor/github.com/docker/swarmkit/volumequeue/queue.go b/vendor/github.com/moby/swarmkit/v2/volumequeue/queue.go similarity index 100% rename from vendor/github.com/docker/swarmkit/volumequeue/queue.go rename to vendor/github.com/moby/swarmkit/v2/volumequeue/queue.go diff --git a/vendor/github.com/docker/swarmkit/watch/queue/queue.go b/vendor/github.com/moby/swarmkit/v2/watch/queue/queue.go similarity index 100% rename from vendor/github.com/docker/swarmkit/watch/queue/queue.go rename to vendor/github.com/moby/swarmkit/v2/watch/queue/queue.go diff --git a/vendor/github.com/docker/swarmkit/watch/sinks.go b/vendor/github.com/moby/swarmkit/v2/watch/sinks.go similarity index 100% rename from vendor/github.com/docker/swarmkit/watch/sinks.go rename to vendor/github.com/moby/swarmkit/v2/watch/sinks.go diff --git a/vendor/github.com/docker/swarmkit/watch/watch.go b/vendor/github.com/moby/swarmkit/v2/watch/watch.go similarity index 99% rename from vendor/github.com/docker/swarmkit/watch/watch.go rename to vendor/github.com/moby/swarmkit/v2/watch/watch.go index ed5b834452..4ad5f35d27 100644 --- a/vendor/github.com/docker/swarmkit/watch/watch.go +++ b/vendor/github.com/moby/swarmkit/v2/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 diff --git a/vendor/github.com/docker/swarmkit/xnet/xnet_unix.go b/vendor/github.com/moby/swarmkit/v2/xnet/xnet_unix.go similarity index 100% rename from vendor/github.com/docker/swarmkit/xnet/xnet_unix.go rename to vendor/github.com/moby/swarmkit/v2/xnet/xnet_unix.go diff --git a/vendor/github.com/docker/swarmkit/xnet/xnet_windows.go b/vendor/github.com/moby/swarmkit/v2/xnet/xnet_windows.go similarity index 100% rename from vendor/github.com/docker/swarmkit/xnet/xnet_windows.go rename to vendor/github.com/moby/swarmkit/v2/xnet/xnet_windows.go diff --git a/vendor/github.com/opencontainers/image-spec/specs-go/v1/descriptor.go b/vendor/github.com/opencontainers/image-spec/specs-go/v1/descriptor.go index 6e442a0853..94f19be628 100644 --- a/vendor/github.com/opencontainers/image-spec/specs-go/v1/descriptor.go +++ b/vendor/github.com/opencontainers/image-spec/specs-go/v1/descriptor.go @@ -35,6 +35,11 @@ type Descriptor struct { // Annotations contains arbitrary metadata relating to the targeted content. Annotations map[string]string `json:"annotations,omitempty"` + // Data is an embedding of the targeted content. This is encoded as a base64 + // string when marshalled to JSON (automatically, by encoding/json). If + // present, Data can be used directly to avoid fetching the targeted content. + Data []byte `json:"data,omitempty"` + // Platform describes the platform which the image in the manifest runs on. // // This should only be used when referring to a manifest. diff --git a/vendor/github.com/opencontainers/image-spec/specs-go/v1/index.go b/vendor/github.com/opencontainers/image-spec/specs-go/v1/index.go index 82da6c6a89..ed4a56e59e 100644 --- a/vendor/github.com/opencontainers/image-spec/specs-go/v1/index.go +++ b/vendor/github.com/opencontainers/image-spec/specs-go/v1/index.go @@ -21,7 +21,7 @@ import "github.com/opencontainers/image-spec/specs-go" type Index struct { specs.Versioned - // MediaType specificies the type of this document data structure e.g. `application/vnd.oci.image.index.v1+json` + // MediaType specifies the type of this document data structure e.g. `application/vnd.oci.image.index.v1+json` MediaType string `json:"mediaType,omitempty"` // Manifests references platform specific manifests. diff --git a/vendor/github.com/opencontainers/image-spec/specs-go/v1/manifest.go b/vendor/github.com/opencontainers/image-spec/specs-go/v1/manifest.go index d72d15ce4b..8212d520c0 100644 --- a/vendor/github.com/opencontainers/image-spec/specs-go/v1/manifest.go +++ b/vendor/github.com/opencontainers/image-spec/specs-go/v1/manifest.go @@ -20,7 +20,7 @@ import "github.com/opencontainers/image-spec/specs-go" type Manifest struct { specs.Versioned - // MediaType specificies the type of this document data structure e.g. `application/vnd.oci.image.manifest.v1+json` + // MediaType specifies the type of this document data structure e.g. `application/vnd.oci.image.manifest.v1+json` MediaType string `json:"mediaType,omitempty"` // Config references a configuration object for a container, by digest. diff --git a/vendor/modules.txt b/vendor/modules.txt index f03860640a..d8469b03a4 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1,4 +1,4 @@ -# cloud.google.com/go v0.92.0 +# cloud.google.com/go v0.93.3 ## explicit; go 1.11 cloud.google.com/go cloud.google.com/go/compute/metadata @@ -57,8 +57,6 @@ github.com/RackSec/srslog # github.com/agext/levenshtein v1.2.3 ## explicit github.com/agext/levenshtein -# github.com/akutz/memconn v0.1.0 -## explicit # github.com/armon/circbuf v0.0.0-20190214190532-5111143e8da2 ## explicit github.com/armon/circbuf @@ -306,74 +304,6 @@ github.com/docker/libkv/store/boltdb # github.com/docker/libtrust v0.0.0-20150526203908-9cbd2a1374f4 ## explicit github.com/docker/libtrust -# github.com/docker/swarmkit v1.12.1-0.20220307221335-616e8db4c3b0 -## explicit -github.com/docker/swarmkit/agent -github.com/docker/swarmkit/agent/configs -github.com/docker/swarmkit/agent/csi -github.com/docker/swarmkit/agent/csi/plugin -github.com/docker/swarmkit/agent/exec -github.com/docker/swarmkit/agent/secrets -github.com/docker/swarmkit/api -github.com/docker/swarmkit/api/deepcopy -github.com/docker/swarmkit/api/defaults -github.com/docker/swarmkit/api/equality -github.com/docker/swarmkit/api/genericresource -github.com/docker/swarmkit/api/naming -github.com/docker/swarmkit/api/validation -github.com/docker/swarmkit/ca -github.com/docker/swarmkit/ca/keyutils -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 -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/constraint -github.com/docker/swarmkit/manager/controlapi -github.com/docker/swarmkit/manager/csi -github.com/docker/swarmkit/manager/dispatcher -github.com/docker/swarmkit/manager/dispatcher/heartbeat -github.com/docker/swarmkit/manager/drivers -github.com/docker/swarmkit/manager/encryption -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 -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/jobs/global -github.com/docker/swarmkit/manager/orchestrator/jobs/replicated -github.com/docker/swarmkit/manager/orchestrator/replicated -github.com/docker/swarmkit/manager/orchestrator/restart -github.com/docker/swarmkit/manager/orchestrator/taskinit -github.com/docker/swarmkit/manager/orchestrator/taskreaper -github.com/docker/swarmkit/manager/orchestrator/update -github.com/docker/swarmkit/manager/orchestrator/volumeenforcer -github.com/docker/swarmkit/manager/raftselector -github.com/docker/swarmkit/manager/resourceapi -github.com/docker/swarmkit/manager/scheduler -github.com/docker/swarmkit/manager/state -github.com/docker/swarmkit/manager/state/raft -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/manager/watchapi -github.com/docker/swarmkit/node -github.com/docker/swarmkit/protobuf/plugin -github.com/docker/swarmkit/protobuf/ptypes -github.com/docker/swarmkit/remotes -github.com/docker/swarmkit/template -github.com/docker/swarmkit/volumequeue -github.com/docker/swarmkit/watch -github.com/docker/swarmkit/watch/queue -github.com/docker/swarmkit/xnet # github.com/dustin/go-humanize v1.0.0 ## explicit github.com/dustin/go-humanize @@ -435,7 +365,7 @@ github.com/golang/protobuf/ptypes/wrappers # github.com/google/btree v1.0.1 ## explicit; go 1.12 github.com/google/btree -# github.com/google/certificate-transparency-go v1.0.20 +# github.com/google/certificate-transparency-go v1.1.2 => github.com/google/certificate-transparency-go v1.0.20 ## explicit github.com/google/certificate-transparency-go github.com/google/certificate-transparency-go/asn1 @@ -482,8 +412,8 @@ github.com/hashicorp/errwrap # github.com/hashicorp/go-immutable-radix v1.3.1 ## explicit github.com/hashicorp/go-immutable-radix -# github.com/hashicorp/go-memdb v0.0.0-20161216180745-cb9a474f84cc -## explicit +# github.com/hashicorp/go-memdb v1.3.2 +## explicit; go 1.12 github.com/hashicorp/go-memdb # github.com/hashicorp/go-msgpack v0.5.3 => github.com/hashicorp/go-msgpack v0.0.0-20140221154404-71c2886f5a67 ## explicit @@ -494,7 +424,7 @@ github.com/hashicorp/go-multierror # github.com/hashicorp/go-sockaddr v1.0.2 ## explicit github.com/hashicorp/go-sockaddr -# github.com/hashicorp/golang-lru v0.5.3 +# github.com/hashicorp/golang-lru v0.5.4 ## explicit; go 1.12 github.com/hashicorp/golang-lru/simplelru # github.com/hashicorp/memberlist v0.2.4 @@ -510,7 +440,7 @@ github.com/imdario/mergo # github.com/inconshreveable/mousetrap v1.0.0 ## explicit github.com/inconshreveable/mousetrap -# github.com/ishidawataru/sctp v0.0.0-20210226210310-f2269e66cdee +# github.com/ishidawataru/sctp v0.0.0-20210707070123-9a39160e9062 ## explicit; go 1.12 github.com/ishidawataru/sctp # github.com/jmespath/go-jmespath v0.3.0 @@ -655,6 +585,74 @@ github.com/moby/ipvs # github.com/moby/locker v1.0.1 ## explicit; go 1.13 github.com/moby/locker +# github.com/moby/swarmkit/v2 v2.0.0-20220420172245-6068d1894d46 +## explicit; go 1.17 +github.com/moby/swarmkit/v2/agent +github.com/moby/swarmkit/v2/agent/configs +github.com/moby/swarmkit/v2/agent/csi +github.com/moby/swarmkit/v2/agent/csi/plugin +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/deepcopy +github.com/moby/swarmkit/v2/api/defaults +github.com/moby/swarmkit/v2/api/equality +github.com/moby/swarmkit/v2/api/genericresource +github.com/moby/swarmkit/v2/api/naming +github.com/moby/swarmkit/v2/api/validation +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/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 +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/constraint +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/dispatcher/heartbeat +github.com/moby/swarmkit/v2/manager/drivers +github.com/moby/swarmkit/v2/manager/encryption +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 +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/jobs/global +github.com/moby/swarmkit/v2/manager/orchestrator/jobs/replicated +github.com/moby/swarmkit/v2/manager/orchestrator/replicated +github.com/moby/swarmkit/v2/manager/orchestrator/restart +github.com/moby/swarmkit/v2/manager/orchestrator/taskinit +github.com/moby/swarmkit/v2/manager/orchestrator/taskreaper +github.com/moby/swarmkit/v2/manager/orchestrator/update +github.com/moby/swarmkit/v2/manager/orchestrator/volumeenforcer +github.com/moby/swarmkit/v2/manager/raftselector +github.com/moby/swarmkit/v2/manager/resourceapi +github.com/moby/swarmkit/v2/manager/scheduler +github.com/moby/swarmkit/v2/manager/state +github.com/moby/swarmkit/v2/manager/state/raft +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/manager/watchapi +github.com/moby/swarmkit/v2/node +github.com/moby/swarmkit/v2/protobuf/plugin +github.com/moby/swarmkit/v2/protobuf/ptypes +github.com/moby/swarmkit/v2/remotes +github.com/moby/swarmkit/v2/template +github.com/moby/swarmkit/v2/volumequeue +github.com/moby/swarmkit/v2/watch +github.com/moby/swarmkit/v2/watch/queue +github.com/moby/swarmkit/v2/xnet # github.com/moby/sys/mount v0.3.1 ## explicit; go 1.16 github.com/moby/sys/mount @@ -677,8 +675,8 @@ github.com/morikuni/aec # github.com/opencontainers/go-digest v1.0.0 ## explicit; go 1.13 github.com/opencontainers/go-digest -# github.com/opencontainers/image-spec v1.0.2-0.20211117181255-693428a734f5 -## explicit +# github.com/opencontainers/image-spec v1.0.3-0.20220303224323-02efb9a75ee1 +## explicit; go 1.16 github.com/opencontainers/image-spec/identity github.com/opencontainers/image-spec/specs-go github.com/opencontainers/image-spec/specs-go/v1 @@ -1129,3 +1127,4 @@ gotest.tools/v3/skip # github.com/vishvananda/netlink => github.com/vishvananda/netlink v1.1.0 # go.opencensus.io => go.opencensus.io v0.22.3 # github.com/rexray/gocsi => github.com/dperny/gocsi v1.2.3-pre +# github.com/google/certificate-transparency-go => github.com/google/certificate-transparency-go v1.0.20