From 36e6f824022ef1baf55c672b757a5ddda8826308 Mon Sep 17 00:00:00 2001 From: Chris Roberts Date: Mon, 15 Jun 2026 15:27:39 -0700 Subject: [PATCH] mod: update internal import paths to use v2 The internal import paths cause problems when attempting to use Nomad as a module since they will resolve to v1. Updating all the internal import paths to include `/v2` fixes that. --- .github/workflows/test-windows.yml | 18 ++-- .semgrep/mpl_busl.yml | 2 +- GNUmakefile | 15 ++-- acl/acl_test.go | 2 +- acl/policy_test.go | 2 +- client/acl.go | 4 +- client/acl_test.go | 14 +-- client/agent_endpoint.go | 12 +-- client/agent_endpoint_test.go | 22 ++--- client/alloc_endpoint.go | 12 +-- client/alloc_endpoint_test.go | 26 +++--- client/alloc_watcher_e2e_test.go | 14 +-- client/allocdir/alloc_dir.go | 6 +- client/allocdir/alloc_dir_nonlinux_test.go | 8 +- client/allocdir/alloc_dir_test.go | 8 +- client/allocdir/fs_linux_test.go | 2 +- client/allocdir/fs_unix.go | 2 +- client/allocdir/input/test.go | 4 +- client/allocdir/task_dir.go | 4 +- client/allocdir/task_dir_test.go | 6 +- client/allochealth/tracker.go | 12 +-- client/allochealth/tracker_test.go | 26 +++--- client/allocrunner/alloc_runner.go | 58 ++++++------ client/allocrunner/alloc_runner_ce.go | 2 +- client/allocrunner/alloc_runner_hooks.go | 12 +-- client/allocrunner/alloc_runner_test.go | 36 ++++---- client/allocrunner/alloc_runner_unix_test.go | 14 +-- client/allocrunner/allocdir_hook.go | 6 +- client/allocrunner/checks_hook.go | 12 +-- client/allocrunner/checks_hook_test.go | 18 ++-- client/allocrunner/consul_grpc_sock_hook.go | 10 +-- .../allocrunner/consul_grpc_sock_hook_test.go | 14 +-- client/allocrunner/consul_hook.go | 18 ++-- client/allocrunner/consul_hook_test.go | 20 ++--- client/allocrunner/consul_http_sock_hook.go | 10 +-- .../allocrunner/consul_http_sock_hook_test.go | 12 +-- client/allocrunner/cpuparts_hook.go | 12 +-- client/allocrunner/csi_hook.go | 20 ++--- client/allocrunner/csi_hook_test.go | 18 ++-- client/allocrunner/fail_hook.go | 4 +- client/allocrunner/group_service_hook.go | 16 ++-- client/allocrunner/group_service_hook_test.go | 20 ++--- client/allocrunner/health_hook.go | 14 +-- client/allocrunner/health_hook_test.go | 24 ++--- client/allocrunner/hookstats/hookstats.go | 2 +- .../allocrunner/hookstats/hookstats_test.go | 2 +- client/allocrunner/identity_hook.go | 6 +- client/allocrunner/identity_hook_test.go | 14 +-- client/allocrunner/interfaces/runner.go | 14 +-- .../interfaces/runner_lifecycle.go | 4 +- .../allocrunner/interfaces/task_lifecycle.go | 12 +-- client/allocrunner/max_run_duration_hook.go | 6 +- .../allocrunner/max_run_duration_hook_test.go | 10 +-- client/allocrunner/migrate_hook.go | 8 +- client/allocrunner/network_hook.go | 8 +- client/allocrunner/network_hook_linux_test.go | 16 ++-- client/allocrunner/network_hook_test.go | 14 +-- client/allocrunner/network_manager_linux.go | 10 +-- .../allocrunner/network_manager_linux_test.go | 10 +-- .../allocrunner/network_manager_nonlinux.go | 8 +- client/allocrunner/networking.go | 4 +- client/allocrunner/networking_bridge_linux.go | 6 +- .../networking_bridge_linux_test.go | 6 +- client/allocrunner/networking_cni.go | 10 +-- .../allocrunner/networking_cni_mock_test.go | 2 +- client/allocrunner/networking_cni_test.go | 10 +-- client/allocrunner/networking_iptables.go | 2 +- .../allocrunner/networking_iptables_test.go | 2 +- client/allocrunner/state/state.go | 4 +- .../allocrunner/tasklifecycle/coordinator.go | 2 +- .../tasklifecycle/coordinator_test.go | 8 +- client/allocrunner/tasklifecycle/gate_test.go | 4 +- client/allocrunner/tasklifecycle/testing.go | 4 +- client/allocrunner/taskrunner/api_hook.go | 8 +- .../allocrunner/taskrunner/api_hook_test.go | 12 +-- .../allocrunner/taskrunner/artifact_hook.go | 10 +-- .../taskrunner/artifact_hook_test.go | 18 ++-- .../taskrunner/connect_native_hook.go | 8 +- .../taskrunner/connect_native_hook_test.go | 24 ++--- client/allocrunner/taskrunner/consul_hook.go | 6 +- .../taskrunner/consul_hook_test.go | 10 +-- client/allocrunner/taskrunner/device_hook.go | 8 +- .../taskrunner/device_hook_test.go | 14 +-- .../allocrunner/taskrunner/dispatch_hook.go | 4 +- .../taskrunner/dispatch_hook_test.go | 14 +-- .../allocrunner/taskrunner/driver_handle.go | 8 +- .../taskrunner/dynamic_users_hook.go | 4 +- .../taskrunner/dynamic_users_hook_test.go | 10 +-- .../taskrunner/envoy_bootstrap_hook.go | 14 +-- .../taskrunner/envoy_bootstrap_hook_test.go | 28 +++--- .../taskrunner/envoy_version_hook.go | 10 +-- .../taskrunner/envoy_version_hook_test.go | 22 ++--- .../allocrunner/taskrunner/errors/errors.go | 2 +- .../taskrunner/errors/errors_test.go | 4 +- .../taskrunner/getter/error_test.go | 2 +- .../allocrunner/taskrunner/getter/params.go | 2 +- .../taskrunner/getter/replacer_test.go | 4 +- .../allocrunner/taskrunner/getter/sandbox.go | 6 +- .../taskrunner/getter/sandbox_default_test.go | 8 +- .../taskrunner/getter/sandbox_test.go | 10 +-- .../allocrunner/taskrunner/getter/testing.go | 6 +- client/allocrunner/taskrunner/getter/util.go | 8 +- .../taskrunner/getter/util_test.go | 6 +- .../taskrunner/getter/z_getter_cmd.go | 2 +- .../allocrunner/taskrunner/identity_hook.go | 14 +-- .../taskrunner/identity_hook_test.go | 22 ++--- .../taskrunner/interfaces/events.go | 2 +- .../taskrunner/interfaces/lifecycle.go | 2 +- client/allocrunner/taskrunner/lazy_handle.go | 4 +- client/allocrunner/taskrunner/lifecycle.go | 4 +- client/allocrunner/taskrunner/logmon_hook.go | 12 +-- .../taskrunner/logmon_hook_test.go | 10 +-- .../taskrunner/logmon_hook_unix_test.go | 10 +-- .../taskrunner/plugin_supervisor_hook.go | 12 +-- .../taskrunner/restarts/restarts.go | 4 +- .../taskrunner/restarts/restarts_test.go | 6 +- .../allocrunner/taskrunner/sched_hook_ce.go | 2 +- .../taskrunner/script_check_hook.go | 14 +-- .../taskrunner/script_check_hook_test.go | 22 ++--- .../taskrunner/secrets/nomad_provider.go | 2 +- .../taskrunner/secrets/nomad_provider_test.go | 2 +- .../taskrunner/secrets/plugin_provider.go | 2 +- .../secrets/plugin_provider_test.go | 2 +- .../taskrunner/secrets/vault_provider.go | 2 +- .../taskrunner/secrets/vault_provider_test.go | 2 +- client/allocrunner/taskrunner/secrets_hook.go | 16 ++-- .../taskrunner/secrets_hook_test.go | 22 ++--- client/allocrunner/taskrunner/service_hook.go | 16 ++-- .../taskrunner/service_hook_test.go | 20 ++--- client/allocrunner/taskrunner/sids_hook.go | 8 +- .../allocrunner/taskrunner/sids_hook_test.go | 6 +- client/allocrunner/taskrunner/state/state.go | 2 +- client/allocrunner/taskrunner/stats_hook.go | 10 +-- .../allocrunner/taskrunner/stats_hook_test.go | 8 +- .../allocrunner/taskrunner/task_dir_hook.go | 12 +-- client/allocrunner/taskrunner/task_runner.go | 56 ++++++------ .../taskrunner/task_runner_getters.go | 4 +- .../taskrunner/task_runner_hooks.go | 10 +-- .../taskrunner/task_runner_linux_test.go | 62 ++++++------- client/allocrunner/taskrunner/tasklet.go | 2 +- client/allocrunner/taskrunner/tasklet_test.go | 8 +- .../taskrunner/template/template.go | 12 +-- .../taskrunner/template/template_default.go | 4 +- .../template/template_default_test.go | 12 +-- .../taskrunner/template/template_test.go | 28 +++--- .../allocrunner/taskrunner/template_hook.go | 14 +-- .../taskrunner/template_hook_test.go | 24 ++--- .../allocrunner/taskrunner/testing/testing.go | 2 +- .../allocrunner/taskrunner/validate_hook.go | 8 +- .../taskrunner/validate_hook_test.go | 8 +- client/allocrunner/taskrunner/vault_hook.go | 14 +-- .../allocrunner/taskrunner/vault_hook_test.go | 24 ++--- client/allocrunner/taskrunner/volume_hook.go | 8 +- .../taskrunner/volume_hook_test.go | 20 ++--- .../allocrunner/taskrunner/wrangler_hook.go | 6 +- client/allocrunner/testing.go | 32 +++---- client/allocrunner/upstream_allocs_hook.go | 6 +- client/allocwatcher/alloc_watcher.go | 12 +-- client/allocwatcher/alloc_watcher_test.go | 14 +-- .../allocwatcher/alloc_watcher_unix_test.go | 6 +- client/allocwatcher/group_alloc_watcher.go | 2 +- .../allocwatcher/group_alloc_watcher_test.go | 8 +- client/client.go | 88 +++++++++---------- client/client_interface_test.go | 26 +++--- client/client_stats_endpoint.go | 4 +- client/client_stats_endpoint_test.go | 12 +-- client/client_test.go | 48 +++++----- client/commonplugins/secrets_plugin.go | 2 +- client/commonplugins/secrets_plugin_test.go | 2 +- client/config/arconfig.go | 32 +++---- client/config/artifact.go | 2 +- client/config/artifact_test.go | 4 +- client/config/config.go | 26 +++--- client/config/config_ce.go | 2 +- client/config/config_test.go | 2 +- client/config/drain.go | 2 +- client/config/fingerprint_test.go | 2 +- client/config/testing.go | 6 +- client/config/users.go | 2 +- client/config/users_test.go | 4 +- client/consul/consul.go | 8 +- client/consul/consul_test.go | 10 +-- client/consul/consul_testing.go | 2 +- client/csi_endpoint.go | 10 +-- client/csi_endpoint_test.go | 14 +-- client/devicemanager/instance.go | 14 +-- client/devicemanager/manager.go | 14 +-- client/devicemanager/manager_test.go | 20 ++--- client/devicemanager/state/state.go | 2 +- client/devicemanager/testing.go | 6 +- client/devicemanager/utils.go | 6 +- client/drain.go | 6 +- client/drain_test.go | 16 ++-- client/driver_manager_test.go | 14 +-- client/dynamicplugins/registry.go | 2 +- client/dynamicplugins/registry_test.go | 2 +- client/fingerprint/arch_test.go | 8 +- client/fingerprint/bridge_linux.go | 2 +- client/fingerprint/bridge_linux_test.go | 4 +- client/fingerprint/cgroup.go | 2 +- client/fingerprint/cni.go | 2 +- client/fingerprint/cni_test.go | 8 +- client/fingerprint/consul.go | 6 +- client/fingerprint/consul_test.go | 10 +-- client/fingerprint/cpu.go | 8 +- client/fingerprint/cpu_darwin_test.go | 8 +- client/fingerprint/cpu_default_test.go | 12 +-- client/fingerprint/dynamic_host_volumes.go | 4 +- .../fingerprint/dynamic_host_volumes_test.go | 8 +- client/fingerprint/env_aws.go | 2 +- client/fingerprint/env_aws_test.go | 8 +- client/fingerprint/env_azure.go | 4 +- client/fingerprint/env_azure_test.go | 8 +- client/fingerprint/env_digitalocean.go | 4 +- client/fingerprint/env_digitalocean_test.go | 8 +- client/fingerprint/env_gce.go | 4 +- client/fingerprint/env_gce_test.go | 8 +- client/fingerprint/fingerprint.go | 2 +- client/fingerprint/fingerprint_retry.go | 2 +- client/fingerprint/fingerprint_retry_test.go | 8 +- client/fingerprint/fingerprint_test.go | 4 +- client/fingerprint/host_test.go | 8 +- client/fingerprint/landlock_test.go | 6 +- client/fingerprint/memory.go | 2 +- client/fingerprint/memory_test.go | 8 +- client/fingerprint/network.go | 4 +- client/fingerprint/network_test.go | 8 +- client/fingerprint/nomad_test.go | 10 +-- client/fingerprint/plugins_cni_test.go | 6 +- client/fingerprint/secrets.go | 4 +- client/fingerprint/secrets_test.go | 6 +- client/fingerprint/signal_test.go | 6 +- client/fingerprint/storage.go | 2 +- client/fingerprint/storage_test.go | 6 +- client/fingerprint/structs.go | 6 +- client/fingerprint/vault.go | 6 +- client/fingerprint/vault_test.go | 10 +-- client/fingerprint_manager.go | 8 +- client/fingerprint_manager_test.go | 4 +- client/fs_endpoint.go | 10 +-- client/fs_endpoint_test.go | 24 ++--- client/gc.go | 4 +- client/gc_test.go | 14 +-- client/heartbeatstop.go | 6 +- client/heartbeatstop_test.go | 10 +-- client/host_volume_endpoint.go | 2 +- client/host_volume_endpoint_test.go | 12 +-- client/hoststats/host.go | 4 +- .../hostvolumemanager/host_volume_plugin.go | 4 +- .../host_volume_plugin_test.go | 6 +- client/hostvolumemanager/host_volumes.go | 6 +- client/hostvolumemanager/host_volumes_test.go | 8 +- .../hostvolumemanager/volume_fingerprint.go | 2 +- .../volume_fingerprint_test.go | 8 +- client/identity_test.go | 6 +- client/interfaces/client.go | 10 +-- client/lib/cgroupslib/partition.go | 4 +- client/lib/cgroupslib/partition_default.go | 4 +- client/lib/cgroupslib/partition_linux.go | 4 +- client/lib/cgroupslib/partition_noop.go | 4 +- client/lib/cgroupslib/partition_test.go | 4 +- client/lib/cpustats/stats.go | 2 +- client/lib/fifo/fifo_test.go | 2 +- client/lib/numalib/detect.go | 4 +- client/lib/numalib/detect_darwin.go | 4 +- client/lib/numalib/detect_generic.go | 4 +- client/lib/numalib/detect_linux.go | 6 +- client/lib/numalib/detect_linux_test.go | 4 +- client/lib/numalib/detect_smbios.go | 2 +- client/lib/numalib/testing.go | 4 +- client/lib/numalib/topology.go | 6 +- client/lib/proclib/config.go | 4 +- client/lib/proclib/testing.go | 2 +- client/lib/proclib/wrangler_cg1_linux.go | 2 +- client/lib/proclib/wrangler_cg2_linux.go | 2 +- client/lib/proclib/wrangler_linux.go | 2 +- client/lib/streamframer/framer_test.go | 2 +- client/logmon/client.go | 4 +- client/logmon/logging/rotator_test.go | 4 +- client/logmon/logmon.go | 4 +- client/logmon/logmon_test.go | 10 +-- client/logmon/plugin.go | 4 +- client/logmon/server.go | 2 +- client/logmon/z_logmon_cmd.go | 2 +- client/meta_endpoint.go | 2 +- client/meta_endpoint_test.go | 14 +-- client/node_identity_endpoint.go | 2 +- client/node_identity_endpoint_test.go | 14 +-- client/node_updater.go | 10 +-- .../pluginmanager/csimanager/fingerprint.go | 6 +- .../csimanager/fingerprint_test.go | 4 +- client/pluginmanager/csimanager/instance.go | 4 +- .../pluginmanager/csimanager/instance_test.go | 10 +-- client/pluginmanager/csimanager/interface.go | 6 +- client/pluginmanager/csimanager/manager.go | 6 +- .../pluginmanager/csimanager/manager_test.go | 10 +-- client/pluginmanager/csimanager/testing.go | 8 +- .../csimanager/usage_tracker_test.go | 4 +- client/pluginmanager/csimanager/volume.go | 6 +- .../pluginmanager/csimanager/volume_test.go | 14 +-- .../pluginmanager/drivermanager/instance.go | 14 +-- .../drivermanager/instance_test.go | 12 +-- client/pluginmanager/drivermanager/manager.go | 14 +-- .../drivermanager/manager_test.go | 20 ++--- .../drivermanager/state/state.go | 2 +- client/pluginmanager/drivermanager/testing.go | 14 +-- client/pluginmanager/group_test.go | 4 +- client/rpc.go | 10 +-- client/rpc_test.go | 12 +-- client/servers/manager.go | 2 +- client/servers/manager_internal_test.go | 4 +- client/servers/manager_test.go | 6 +- client/serviceregistration/address.go | 4 +- client/serviceregistration/address_test.go | 4 +- .../checks/checkstore/shim.go | 6 +- .../checks/checkstore/shim_test.go | 12 +-- client/serviceregistration/checks/client.go | 6 +- .../serviceregistration/checks/client_test.go | 10 +-- client/serviceregistration/checks/result.go | 2 +- .../serviceregistration/checks/result_test.go | 2 +- client/serviceregistration/id.go | 2 +- client/serviceregistration/id_test.go | 2 +- client/serviceregistration/mock/mock.go | 2 +- client/serviceregistration/nsd/nsd.go | 4 +- client/serviceregistration/nsd/nsd_test.go | 6 +- client/serviceregistration/nsd/statuses.go | 2 +- .../serviceregistration/nsd/statuses_test.go | 14 +-- .../service_registration.go | 2 +- .../service_registration_test.go | 2 +- client/serviceregistration/watcher.go | 4 +- client/serviceregistration/watcher_test.go | 8 +- client/serviceregistration/workload.go | 6 +- client/serviceregistration/workload_test.go | 2 +- client/serviceregistration/wrapper/wrapper.go | 4 +- .../wrapper/wrapper_test.go | 6 +- client/state/08types.go | 10 +-- client/state/12types.go | 2 +- client/state/db_bolt.go | 18 ++-- client/state/db_error.go | 16 ++-- client/state/db_mem.go | 16 ++-- client/state/db_noop.go | 16 ++-- client/state/db_test.go | 18 ++-- client/state/interface.go | 16 ++-- client/state/upgrade.go | 6 +- client/state/upgrade_int_test.go | 34 +++---- client/state/upgrade_test.go | 8 +- client/structs/allochook.go | 6 +- client/structs/broadcaster.go | 2 +- client/structs/broadcaster_test.go | 6 +- client/structs/csi.go | 4 +- client/structs/csi_test.go | 2 +- client/structs/structs.go | 6 +- client/taskenv/env.go | 12 +-- client/taskenv/env_test.go | 10 +-- client/taskenv/network.go | 2 +- client/taskenv/network_test.go | 4 +- client/taskenv/services.go | 2 +- client/taskenv/services_test.go | 4 +- client/taskenv/util_test.go | 2 +- client/testing.go | 20 ++--- client/testutil/docker.go | 2 +- client/testutil/rpc.go | 4 +- client/util.go | 2 +- client/vaultclient/vaultclient.go | 4 +- client/vaultclient/vaultclient_test.go | 20 ++--- client/vaultclient/vaultclient_testing.go | 2 +- client/widmgr/mock.go | 4 +- client/widmgr/signer.go | 2 +- client/widmgr/widmgr.go | 8 +- client/widmgr/widmgr_int_test.go | 14 +-- client/widmgr/widmgr_test.go | 10 +-- command/acl_auth_method_create_test.go | 6 +- command/acl_auth_method_delete_test.go | 8 +- command/acl_auth_method_info_test.go | 8 +- command/acl_auth_method_list_test.go | 8 +- command/acl_auth_method_update_test.go | 8 +- command/acl_binding_rule.go | 2 +- command/acl_binding_rule_create_test.go | 8 +- command/acl_binding_rule_delete_test.go | 10 +-- command/acl_binding_rule_info_test.go | 10 +-- command/acl_binding_rule_list_test.go | 10 +-- command/acl_binding_rule_update_test.go | 10 +-- command/acl_bootstrap_test.go | 6 +- command/acl_policy.go | 2 +- command/acl_policy_apply_test.go | 6 +- command/acl_policy_delete_test.go | 10 +-- command/acl_policy_info_test.go | 8 +- command/acl_policy_list_test.go | 10 +-- command/acl_policy_self_test.go | 6 +- command/acl_role.go | 2 +- command/acl_role_create_test.go | 8 +- command/acl_role_delete_test.go | 10 +-- command/acl_role_info_test.go | 10 +-- command/acl_role_list_test.go | 10 +-- command/acl_role_update_test.go | 10 +-- command/acl_token.go | 2 +- command/acl_token_create.go | 2 +- command/acl_token_create_test.go | 4 +- command/acl_token_delete_test.go | 10 +-- command/acl_token_info_test.go | 8 +- command/acl_token_list_test.go | 10 +-- command/acl_token_self.go | 2 +- command/acl_token_self_test.go | 8 +- command/acl_token_update_test.go | 10 +-- command/agent/acl_endpoint.go | 4 +- command/agent/acl_endpoint_test.go | 10 +-- command/agent/agent.go | 34 +++---- command/agent/agent_ce.go | 2 +- command/agent/agent_endpoint.go | 14 +-- command/agent/agent_endpoint_test.go | 14 +-- command/agent/agent_test.go | 16 ++-- command/agent/alloc_endpoint.go | 6 +- command/agent/alloc_endpoint_test.go | 16 ++-- command/agent/command.go | 16 ++-- command/agent/command_test.go | 8 +- command/agent/config.go | 22 ++--- command/agent/config_parse.go | 10 +-- command/agent/config_parse_test.go | 8 +- command/agent/config_test.go | 10 +-- .../agent/consul/config_entries_testing.go | 2 +- command/agent/consul/connect.go | 2 +- command/agent/consul/connect_proxies_test.go | 2 +- command/agent/consul/connect_test.go | 6 +- command/agent/consul/group_test.go | 10 +-- command/agent/consul/int_test.go | 32 +++---- .../agent/consul/namespaces_client_test.go | 2 +- command/agent/consul/self_test.go | 2 +- command/agent/consul/service_client.go | 8 +- command/agent/consul/service_client_test.go | 10 +-- command/agent/consul/structs.go | 10 +-- command/agent/consul/testing.go | 4 +- command/agent/consul/unit_test.go | 12 +-- command/agent/consul/version_checker.go | 2 +- command/agent/consul/version_checker_test.go | 2 +- command/agent/csi_endpoint.go | 2 +- command/agent/csi_endpoint_test.go | 6 +- command/agent/deployment_endpoint.go | 2 +- command/agent/deployment_endpoint_test.go | 6 +- command/agent/eval_endpoint.go | 2 +- command/agent/eval_endpoint_test.go | 8 +- command/agent/event_endpoint.go | 2 +- command/agent/event_endpoint_test.go | 10 +-- command/agent/fs_endpoint.go | 4 +- command/agent/fs_endpoint_test.go | 12 +-- command/agent/helpers_test.go | 4 +- command/agent/host_volume_endpoint.go | 2 +- command/agent/host_volume_endpoint_test.go | 4 +- command/agent/http.go | 16 ++-- command/agent/http_stdlog_test.go | 2 +- command/agent/http_test.go | 16 ++-- command/agent/job_endpoint.go | 8 +- command/agent/job_endpoint_statuses.go | 2 +- command/agent/job_endpoint_statuses_test.go | 6 +- command/agent/job_endpoint_test.go | 8 +- command/agent/keyring_endpoint.go | 4 +- command/agent/keyring_endpoint_test.go | 6 +- command/agent/keyring_test.go | 4 +- command/agent/log_file_test.go | 2 +- command/agent/log_levels_test.go | 2 +- command/agent/meta_endpoint.go | 2 +- command/agent/metrics_endpoint_test.go | 8 +- command/agent/monitor/monitor.go | 2 +- command/agent/monitor/monitor_test.go | 2 +- command/agent/monitor/stream_helpers.go | 4 +- command/agent/monitor/stream_helpers_test.go | 4 +- command/agent/monitor/test_helpers.go | 6 +- command/agent/namespace_endpoint.go | 2 +- command/agent/namespace_endpoint_test.go | 6 +- command/agent/node_endpoint.go | 2 +- command/agent/node_endpoint_test.go | 6 +- command/agent/node_identity_endpoint.go | 2 +- command/agent/node_identity_endpoint_test.go | 8 +- command/agent/node_pool_endpoint.go | 2 +- command/agent/node_pool_endpoint_test.go | 6 +- command/agent/operator_endpoint.go | 4 +- command/agent/operator_endpoint_ce.go | 2 +- command/agent/operator_endpoint_test.go | 8 +- command/agent/plugins.go | 6 +- command/agent/pprof/pprof_test.go | 2 +- command/agent/region_endpoint.go | 2 +- command/agent/region_endpoint_test.go | 2 +- command/agent/retry_join_test.go | 8 +- command/agent/scaling_endpoint.go | 2 +- command/agent/scaling_endpoint_test.go | 6 +- command/agent/search_endpoint.go | 2 +- command/agent/search_endpoint_test.go | 8 +- .../agent/service_registration_endpoint.go | 2 +- .../service_registration_endpoint_test.go | 6 +- command/agent/stats_endpoint.go | 4 +- command/agent/stats_endpoint_test.go | 12 +-- command/agent/status_endpoint.go | 2 +- command/agent/status_endpoint_test.go | 2 +- command/agent/syslog_test.go | 2 +- command/agent/system_endpoint.go | 2 +- command/agent/system_endpoint_test.go | 2 +- .../task_group_host_volume_claim_endpoint.go | 2 +- ...k_group_host_volume_claim_endpoint_test.go | 6 +- command/agent/testagent.go | 20 ++--- command/agent/testingutils_test.go | 2 +- command/agent/tls_metrics.go | 4 +- command/agent/tls_metrics_test.go | 8 +- command/agent/variable_endpoint.go | 2 +- command/agent/variable_endpoint_test.go | 6 +- command/agent/volumes_endpoint.go | 2 +- command/agent/websockets_test.go | 8 +- command/agent_info_test.go | 4 +- command/agent_monitor_export_test.go | 4 +- command/agent_monitor_test.go | 2 +- command/alloc_checks_test.go | 6 +- command/alloc_exec.go | 2 +- command/alloc_exec_test.go | 10 +-- command/alloc_fs_test.go | 6 +- command/alloc_logs.go | 2 +- command/alloc_logs_test.go | 6 +- command/alloc_pause_test.go | 2 +- command/alloc_restart_test.go | 6 +- command/alloc_signal_test.go | 6 +- command/alloc_status_test.go | 10 +-- command/alloc_stop_test.go | 2 +- command/check_test.go | 2 +- command/commands.go | 4 +- command/config_validate.go | 2 +- command/config_validate_test.go | 2 +- command/data_format_test.go | 2 +- command/deployment_fail_test.go | 4 +- command/deployment_list_test.go | 2 +- command/deployment_pause_test.go | 4 +- command/deployment_promote.go | 2 +- command/deployment_promote_test.go | 4 +- command/deployment_resume_test.go | 4 +- command/deployment_status.go | 2 +- command/deployment_status_test.go | 4 +- command/deployment_unblock_test.go | 4 +- command/eval_delete_test.go | 2 +- command/eval_list_test.go | 2 +- command/eval_status_test.go | 8 +- command/fmt_test.go | 2 +- command/helper_devices_test.go | 2 +- command/helpers.go | 4 +- command/helpers_test.go | 6 +- command/integration_test.go | 4 +- command/job_action.go | 2 +- command/job_allocs_test.go | 8 +- command/job_deployments_test.go | 8 +- command/job_dispatch.go | 2 +- command/job_dispatch_test.go | 8 +- command/job_eval_test.go | 10 +-- command/job_history_test.go | 8 +- command/job_init.go | 2 +- command/job_init_test.go | 4 +- command/job_inspect_test.go | 10 +-- command/job_periodic_force_test.go | 10 +-- command/job_plan.go | 2 +- command/job_plan_test.go | 4 +- command/job_promote.go | 2 +- command/job_promote_test.go | 8 +- command/job_restart_test.go | 6 +- command/job_revert_test.go | 8 +- command/job_run_test.go | 4 +- command/job_scale_test.go | 10 +-- command/job_scaling_events_test.go | 10 +-- command/job_start.go | 2 +- command/job_start_test.go | 10 +-- command/job_status_test.go | 10 +-- command/job_stop_test.go | 10 +-- command/job_tag_test.go | 6 +- command/job_validate.go | 4 +- command/job_validate_test.go | 4 +- command/license_get_test.go | 2 +- command/login.go | 2 +- command/login_test.go | 8 +- command/meta_test.go | 4 +- command/metrics_test.go | 2 +- command/monitor_test.go | 4 +- command/namespace_apply.go | 2 +- command/namespace_apply_test.go | 2 +- command/namespace_delete_test.go | 2 +- command/namespace_inspect_test.go | 2 +- command/namespace_list_test.go | 2 +- command/namespace_status_test.go | 2 +- command/node_config_test.go | 4 +- command/node_drain.go | 2 +- command/node_drain_test.go | 6 +- command/node_eligibility_test.go | 4 +- command/node_identity_get_test.go | 4 +- command/node_intro_create_test.go | 4 +- command/node_intro_test.go | 2 +- command/node_meta_apply_test.go | 2 +- command/node_pool_apply.go | 2 +- command/node_pool_apply_test.go | 2 +- command/node_pool_delete_test.go | 2 +- command/node_pool_info_test.go | 2 +- command/node_pool_init.go | 2 +- command/node_pool_init_test.go | 4 +- command/node_pool_jobs_test.go | 4 +- command/node_pool_list_test.go | 2 +- command/node_pool_nodes_test.go | 8 +- command/node_pool_test.go | 2 +- command/node_status_test.go | 6 +- command/operator_api_test.go | 2 +- command/operator_autopilot_get_test.go | 2 +- command/operator_autopilot_health_test.go | 2 +- command/operator_autopilot_set.go | 2 +- command/operator_autopilot_set_test.go | 2 +- command/operator_autopilot_test.go | 2 +- command/operator_client_state.go | 4 +- command/operator_client_state_test.go | 8 +- command/operator_debug.go | 6 +- command/operator_debug_test.go | 14 +-- command/operator_gossip_keyring_test.go | 2 +- command/operator_raft_info.go | 2 +- command/operator_raft_list_test.go | 2 +- command/operator_raft_logs.go | 2 +- command/operator_raft_migrate.go | 2 +- command/operator_raft_remove_test.go | 2 +- command/operator_raft_state.go | 2 +- command/operator_raft_test.go | 2 +- command/operator_scheduler_get_config_test.go | 2 +- command/operator_scheduler_set_config.go | 2 +- command/operator_scheduler_set_config_test.go | 2 +- command/operator_snapshot_inspect.go | 4 +- command/operator_snapshot_inspect_test.go | 4 +- command/operator_snapshot_redact.go | 2 +- command/operator_snapshot_restore_test.go | 6 +- command/operator_snapshot_save.go | 2 +- command/operator_snapshot_save_test.go | 6 +- command/operator_snapshot_state.go | 6 +- command/operator_test.go | 2 +- command/plugin_status_test.go | 4 +- command/quota_apply.go | 2 +- command/quota_apply_test.go | 2 +- command/quota_delete_test.go | 6 +- command/quota_init_test.go | 2 +- command/quota_inspect_test.go | 2 +- command/quota_list_test.go | 2 +- command/quota_status_test.go | 2 +- command/recommendation_apply_test.go | 4 +- command/recommendation_dismiss_test.go | 6 +- command/recommendation_info_test.go | 4 +- command/recommendation_list_test.go | 4 +- command/scaling_policy_info_test.go | 4 +- command/scaling_policy_list_test.go | 2 +- command/scaling_policy_test.go | 2 +- command/sentinel_apply_test.go | 2 +- command/sentinel_delete_test.go | 2 +- command/sentinel_list_test.go | 2 +- command/sentinel_read_test.go | 2 +- command/server_force_leave.go | 2 +- command/server_force_leave_test.go | 2 +- command/server_join_test.go | 2 +- command/server_members_test.go | 4 +- command/service_delete_test.go | 8 +- command/service_info_test.go | 4 +- command/service_list_test.go | 4 +- command/setup_vault_test.go | 4 +- command/status_test.go | 10 +-- command/system_gc_test.go | 2 +- command/system_reconcile_summaries_test.go | 2 +- command/system_reconcile_test.go | 2 +- command/system_test.go | 2 +- command/testing_test.go | 6 +- command/tls_ca_create.go | 6 +- command/tls_ca_create_test.go | 2 +- command/tls_ca_info.go | 2 +- command/tls_cert_create.go | 6 +- command/tls_cert_create_test.go | 4 +- command/tls_cert_info.go | 2 +- command/ui/writer_ui_test.go | 2 +- command/var_get_test.go | 2 +- command/var_init_test.go | 2 +- command/var_list_test.go | 2 +- command/var_lock_test.go | 2 +- command/var_purge_test.go | 2 +- command/var_put.go | 2 +- command/var_put_test.go | 2 +- command/version.go | 2 +- command/version_test.go | 2 +- command/volume_claim_delete_test.go | 10 +-- command/volume_claim_list_test.go | 10 +-- command/volume_create_csi_test.go | 2 +- command/volume_create_host.go | 2 +- command/volume_create_host_test.go | 4 +- command/volume_delete.go | 4 +- command/volume_delete_host_test.go | 2 +- command/volume_init.go | 2 +- command/volume_register_csi.go | 2 +- command/volume_register_csi_test.go | 2 +- command/volume_register_host_test.go | 2 +- command/volume_snapshot_create.go | 2 +- command/volume_snapshot_delete.go | 2 +- command/volume_snapshot_list.go | 2 +- command/volume_status_csi_test.go | 6 +- command/volume_status_host_test.go | 2 +- command/windows_service_install.go | 2 +- command/windows_service_install_test.go | 2 +- command/windows_service_uninstall.go | 2 +- command/windows_service_uninstall_test.go | 2 +- drivers/docker/cmd/main.go | 8 +- drivers/docker/config.go | 14 +-- drivers/docker/config_test.go | 6 +- drivers/docker/coordinator.go | 2 +- drivers/docker/coordinator_test.go | 8 +- drivers/docker/cpuset.go | 4 +- drivers/docker/cpuset_test.go | 4 +- drivers/docker/docklog/client.go | 2 +- drivers/docker/docklog/docker_logger.go | 2 +- drivers/docker/docklog/docker_logger_test.go | 8 +- drivers/docker/docklog/plugin.go | 4 +- drivers/docker/docklog/server.go | 2 +- drivers/docker/docklog/z_docker_logger_cmd.go | 2 +- drivers/docker/driver.go | 26 +++--- drivers/docker/driver_linux_test.go | 4 +- drivers/docker/driver_test.go | 28 +++--- drivers/docker/driver_unix_test.go | 14 +-- drivers/docker/driver_windows_test.go | 8 +- drivers/docker/fingerprint.go | 6 +- drivers/docker/fingerprint_test.go | 10 +-- drivers/docker/handle.go | 8 +- drivers/docker/handle_test.go | 4 +- drivers/docker/network.go | 2 +- drivers/docker/network_test.go | 4 +- drivers/docker/ports.go | 2 +- drivers/docker/ports_test.go | 4 +- drivers/docker/progress_test.go | 2 +- drivers/docker/reconcile_dangling_test.go | 8 +- drivers/docker/stats.go | 10 +-- drivers/docker/stats_test.go | 10 +-- drivers/docker/util/stats_posix.go | 4 +- drivers/docker/util/stats_windows.go | 4 +- drivers/docker/utils_test.go | 2 +- drivers/docker/utils_unix_test.go | 2 +- drivers/exec/driver.go | 28 +++--- drivers/exec/driver_test.go | 30 +++---- drivers/exec/driver_unix_test.go | 18 ++-- drivers/exec/handle.go | 4 +- drivers/java/driver.go | 24 ++--- drivers/java/driver_test.go | 24 ++--- drivers/java/handle.go | 4 +- drivers/java/utils_test.go | 2 +- drivers/mock/command.go | 4 +- drivers/mock/driver.go | 16 ++-- drivers/mock/driver_test.go | 24 ++--- drivers/mock/handle.go | 4 +- drivers/mock/utils_test.go | 2 +- drivers/qemu/driver.go | 20 ++--- drivers/qemu/driver_test.go | 24 ++--- drivers/qemu/handle.go | 4 +- drivers/rawexec/driver.go | 24 ++--- drivers/rawexec/driver_test.go | 32 +++---- drivers/rawexec/driver_unix.go | 4 +- drivers/rawexec/driver_unix_test.go | 20 ++--- drivers/rawexec/driver_windows.go | 2 +- drivers/rawexec/driver_windows_test.go | 10 +-- drivers/rawexec/handle.go | 4 +- drivers/shared/capabilities/defaults_test.go | 2 +- drivers/shared/capabilities/set_test.go | 2 +- drivers/shared/eventer/eventer.go | 4 +- drivers/shared/eventer/eventer_test.go | 6 +- drivers/shared/executor/exec_utils.go | 4 +- drivers/shared/executor/executor.go | 14 +-- drivers/shared/executor/executor_basic.go | 6 +- drivers/shared/executor/executor_linux.go | 4 +- drivers/shared/executor/executor_linux_cgo.go | 20 ++--- .../shared/executor/executor_linux_test.go | 24 ++--- drivers/shared/executor/executor_plugin.go | 4 +- drivers/shared/executor/executor_test.go | 28 +++--- .../executor/executor_universal_linux.go | 8 +- .../executor/executor_universal_linux_test.go | 8 +- drivers/shared/executor/executor_unix.go | 2 +- drivers/shared/executor/executor_windows.go | 6 +- .../shared/executor/executor_windows_test.go | 18 ++-- drivers/shared/executor/grpc_client.go | 10 +-- drivers/shared/executor/grpc_server.go | 8 +- drivers/shared/executor/plugins.go | 2 +- drivers/shared/executor/procstats/getstats.go | 4 +- .../executor/procstats/getstats_test.go | 2 +- .../shared/executor/procstats/list_default.go | 2 +- .../shared/executor/procstats/list_linux.go | 2 +- .../shared/executor/procstats/procstats.go | 4 +- drivers/shared/executor/proto/executor.pb.go | 2 +- drivers/shared/executor/utils.go | 8 +- drivers/shared/executor/utils_test.go | 4 +- drivers/shared/executor/z_executor_cmd.go | 2 +- drivers/shared/hostnames/mount.go | 2 +- drivers/shared/hostnames/mount_unix_test.go | 2 +- drivers/shared/resolvconf/mount.go | 4 +- drivers/shared/resolvconf/mount_unix_test.go | 2 +- drivers/shared/validators/validators.go | 4 +- e2e/acl/acl_role_test.go | 4 +- e2e/acl/acl_test.go | 2 +- e2e/acl/acl_token_test.go | 4 +- e2e/affinities/affinities.go | 6 +- e2e/alloc_logs/alloc_logs_test.go | 4 +- e2e/allocexec/docker_exec_test.go | 4 +- e2e/artifact/artifact_test.go | 4 +- e2e/auth/auth_test.go | 4 +- e2e/batch_timeout/batch_timeout_test.go | 6 +- e2e/client_identity/client_identity_test.go | 2 +- e2e/client_intro/client_intro_test.go | 6 +- e2e/clientstate/allocs_test.go | 4 +- e2e/clientstate/clientstate.go | 18 ++-- e2e/cni/cni_test.go | 4 +- e2e/connect/client_test.go | 4 +- e2e/connect/connect_test.go | 4 +- e2e/consul/alloc_restart_test.go | 4 +- e2e/consul/check_restart.go | 6 +- e2e/consul/consul.go | 12 +-- e2e/consul/consul_test.go | 2 +- e2e/consul/namespaces.go | 4 +- e2e/consul/namespaces_ce.go | 4 +- e2e/consul/on_update.go | 8 +- e2e/consul/script_checks.go | 6 +- e2e/consul/service_revert_test.go | 6 +- e2e/consulcompat/consulcompat_test.go | 2 +- e2e/consulcompat/run_ce_test.go | 2 +- e2e/consulcompat/shared_run_test.go | 2 +- e2e/consulcompat/shared_setup_test.go | 6 +- e2e/consultemplate/consultemplate_test.go | 10 +-- e2e/csi/csi.go | 8 +- e2e/csi/ebs.go | 10 +-- e2e/csi/efs.go | 6 +- e2e/deployment/deployment.go | 10 +-- .../disconnectedclients_test.go | 6 +- e2e/docker/docker_test.go | 6 +- .../dynamic_host_volumes_test.go | 6 +- e2e/e2e_test.go | 70 +++++++-------- e2e/e2eutil/acl.go | 2 +- e2e/e2eutil/allocs.go | 2 +- e2e/e2eutil/cli.go | 2 +- e2e/e2eutil/client.go | 2 +- e2e/e2eutil/consul.go | 2 +- e2e/e2eutil/deployments.go | 2 +- e2e/e2eutil/e2ejob.go | 10 +-- e2e/e2eutil/node.go | 2 +- e2e/e2eutil/utils.go | 6 +- e2e/eval_priority/eval_priority.go | 6 +- e2e/events/events.go | 10 +-- e2e/example/example_test.go | 8 +- e2e/exec2/exec2_test.go | 4 +- e2e/framework/context.go | 2 +- e2e/framework/framework.go | 2 +- e2e/framework/provisioner.go | 4 +- e2e/isolation/chroot_test.go | 4 +- e2e/isolation/devices_test.go | 4 +- e2e/isolation/pids_test.go | 4 +- e2e/jobsubmissions/jobsubapi_test.go | 6 +- e2e/keyring/keyring_test.go | 2 +- e2e/lifecycle/lifecycle.go | 10 +-- e2e/metrics/metrics_test.go | 6 +- e2e/namespaces/namespaces_test.go | 4 +- e2e/networking/networking.go | 6 +- e2e/nodedrain/node_drain_test.go | 6 +- e2e/nomadexec/exec_test.go | 8 +- .../operator_scheduler_test.go | 4 +- e2e/overlap/overlap_test.go | 6 +- e2e/oversubscription/oversubscription_test.go | 6 +- e2e/parameterized/parameterized.go | 8 +- e2e/periodic/periodic_test.go | 4 +- e2e/pledge/pledge_test.go | 6 +- e2e/podman/podman_test.go | 6 +- e2e/rawexec/rawexec_test.go | 4 +- e2e/rescheduling/rescheduling_test.go | 4 +- e2e/scaling/scaling_test.go | 8 +- e2e/scalingpolicies/scalingpolicies.go | 6 +- e2e/scheduler_sysbatch/sysbatch.go | 6 +- e2e/scheduler_system/systemsched_test.go | 6 +- e2e/secret/secret_test.go | 6 +- e2e/servicediscovery/nomad_checks_test.go | 8 +- .../service_discovery_test.go | 4 +- e2e/servicediscovery/simple_lb_test.go | 4 +- e2e/spread/spread_test.go | 4 +- e2e/task_schedule/task_schedule_test.go | 4 +- e2e/taskevents/taskevents.go | 8 +- e2e/v3/jobs3/jobs3.go | 4 +- e2e/v3/namespaces3/namespaces3.go | 4 +- e2e/v3/volumes3/host3.go | 2 +- e2e/vaultcompat/vaultcompat_test.go | 6 +- e2e/vaultsecrets/vaultsecrets_test.go | 10 +-- e2e/volume_mounts/volumes_test.go | 4 +- e2e/workload_id/nodemeta_test.go | 6 +- e2e/workload_id/taskapi_test.go | 8 +- e2e/workload_id/workload_id_test.go | 4 +- go.mod | 2 +- helper/boltdd/boltdd.go | 2 +- helper/boltdd/boltdd_test.go | 6 +- helper/broker/notify.go | 2 +- helper/broker/notify_test.go | 2 +- helper/envoy/envoy_test.go | 4 +- helper/file_test.go | 2 +- helper/flags/autopilot_flags_test.go | 2 +- helper/flags/flag_test.go | 2 +- helper/opaque_test.go | 2 +- helper/pluginutils/catalog/catalog.go | 2 +- helper/pluginutils/catalog/register.go | 8 +- helper/pluginutils/catalog/register_cgo.go | 10 +-- .../pluginutils/catalog/register_testing.go | 2 +- helper/pluginutils/catalog/testing.go | 6 +- helper/pluginutils/grpcutils/utils.go | 2 +- helper/pluginutils/hclspecutils/dec.go | 2 +- helper/pluginutils/hclspecutils/dec_test.go | 4 +- helper/pluginutils/hclutils/testing.go | 8 +- helper/pluginutils/hclutils/types_test.go | 4 +- helper/pluginutils/hclutils/util.go | 2 +- helper/pluginutils/hclutils/util_test.go | 10 +-- helper/pluginutils/loader/api_versions.go | 6 +- helper/pluginutils/loader/init.go | 8 +- helper/pluginutils/loader/loader.go | 12 +-- helper/pluginutils/loader/loader_test.go | 10 +-- helper/pluginutils/loader/plugin_test.go | 6 +- helper/pluginutils/loader/testing.go | 2 +- helper/pluginutils/loader/util.go | 2 +- helper/pluginutils/singleton/future.go | 4 +- helper/pluginutils/singleton/singleton.go | 4 +- .../pluginutils/singleton/singleton_test.go | 8 +- helper/pointer/pointer_test.go | 2 +- helper/pool/pool.go | 6 +- helper/pool/pool_test.go | 4 +- helper/raftutil/fsm.go | 6 +- helper/raftutil/fsm_ce.go | 2 +- helper/raftutil/fsm_test.go | 2 +- helper/raftutil/generate_msgtypes.sh | 2 +- helper/raftutil/msgpack.go | 2 +- helper/raftutil/msgpack_test.go | 4 +- helper/raftutil/msgtypes.go | 2 +- helper/raftutil/sample_test.go | 10 +-- helper/raftutil/snapshot.go | 8 +- helper/raftutil/state.go | 2 +- helper/raftutil/state_test.go | 2 +- helper/snapshot/snapshot_test.go | 4 +- helper/testtask/testtask.go | 4 +- helper/tlsutil/config.go | 2 +- helper/tlsutil/config_test.go | 4 +- helper/tlsutil/generate_test.go | 2 +- helper/useragent/useragent.go | 2 +- helper/users/cache.go | 2 +- helper/users/cache_test.go | 2 +- helper/users/dynamic/pool.go | 2 +- helper/users/dynamic/users.go | 2 +- helper/users/lookup_linux_test.go | 2 +- helper/users/lookup_windows_test.go | 2 +- helper/uuid/uuid.go | 2 +- helper/warning_test.go | 2 +- helper/winsvc/events_windows.go | 2 +- helper/winsvc/path_windows_test.go | 2 +- helper/winsvc/windows_service_windows.go | 2 +- helper/winsvc/windows_service_windows_test.go | 2 +- internal/testing/apitests/acl_test.go | 2 +- internal/testing/apitests/api_test.go | 2 +- internal/testing/apitests/jobs_test.go | 4 +- internal/testing/apitests/nodes_test.go | 6 +- .../apitests/operator_autopilot_test.go | 4 +- internal/testing/apitests/operator_test.go | 2 +- .../testing/apitests/streamingsync_test.go | 4 +- internal/testing/apitests/structsync_test.go | 4 +- internal/testing/apitests/tasks_test.go | 4 +- jobspec2/types.config.go | 2 +- jobspec2/types.variables.go | 2 +- lib/auth/binder.go | 2 +- lib/auth/binder_test.go | 10 +-- lib/auth/claims.go | 2 +- lib/auth/claims_test.go | 2 +- lib/auth/identity.go | 2 +- lib/auth/identity_test.go | 4 +- lib/auth/jwt/validator.go | 4 +- lib/auth/jwt/validator_test.go | 4 +- lib/auth/oidc/client_assertion.go | 2 +- lib/auth/oidc/client_assertion_test.go | 2 +- lib/auth/oidc/provider.go | 2 +- lib/auth/oidc/provider_test.go | 2 +- lib/delayheap/delay_heap.go | 2 +- lib/delayheap/delay_heap_test.go | 2 +- lib/kheap/score_heap_test.go | 2 +- lib/lang/maps.go | 2 +- main.go | 14 +-- nomad/acl.go | 4 +- nomad/acl_endpoint.go | 22 ++--- nomad/acl_endpoint_test.go | 12 +-- nomad/acl_test.go | 12 +-- nomad/alloc_endpoint.go | 10 +-- nomad/alloc_endpoint_test.go | 12 +-- nomad/auth/auth.go | 8 +- nomad/auth/auth_test.go | 14 +-- nomad/autopilot.go | 6 +- nomad/autopilot_ce.go | 4 +- nomad/autopilot_test.go | 6 +- nomad/blocked_evals.go | 4 +- nomad/blocked_evals_stats.go | 2 +- nomad/blocked_evals_stats_test.go | 6 +- nomad/blocked_evals_system.go | 2 +- nomad/blocked_evals_test.go | 8 +- nomad/client_agent_endpoint.go | 14 +-- nomad/client_agent_endpoint_test.go | 24 ++--- nomad/client_alloc_endpoint.go | 6 +- nomad/client_alloc_endpoint_test.go | 20 ++--- nomad/client_csi_endpoint.go | 4 +- nomad/client_csi_endpoint_test.go | 16 ++-- nomad/client_fs_endpoint.go | 6 +- nomad/client_fs_endpoint_test.go | 18 ++-- nomad/client_host_volume_endpoint.go | 4 +- nomad/client_identity_endpoint.go | 2 +- nomad/client_identity_endpoint_test.go | 10 +-- nomad/client_meta_endpoint.go | 4 +- nomad/client_meta_endpoint_test.go | 10 +-- nomad/client_rpc.go | 6 +- nomad/client_rpc_test.go | 12 +-- nomad/client_stats_endpoint.go | 4 +- nomad/client_stats_endpoint_test.go | 18 ++-- nomad/config.go | 14 +-- nomad/consul.go | 4 +- nomad/consul_test.go | 8 +- nomad/core_sched.go | 8 +- nomad/core_sched_test.go | 14 +-- nomad/csi_endpoint.go | 12 +-- nomad/csi_endpoint_ce.go | 4 +- nomad/csi_endpoint_test.go | 24 ++--- nomad/deployment_endpoint.go | 8 +- nomad/deployment_endpoint_test.go | 12 +-- nomad/deployment_watcher_shims.go | 2 +- nomad/deploymentwatcher/batcher.go | 2 +- nomad/deploymentwatcher/deployment_watcher.go | 6 +- .../deploymentwatcher/deployments_watcher.go | 4 +- .../deployments_watcher_test.go | 12 +-- nomad/deploymentwatcher/multiregion_ce.go | 2 +- nomad/deploymentwatcher/testutil_test.go | 4 +- nomad/drainer/drain_heap_test.go | 4 +- nomad/drainer/drain_testing.go | 6 +- nomad/drainer/drainer.go | 6 +- nomad/drainer/drainer_util.go | 2 +- nomad/drainer/drainer_util_test.go | 4 +- nomad/drainer/draining_node.go | 4 +- nomad/drainer/draining_node_test.go | 8 +- nomad/drainer/watch_jobs.go | 6 +- nomad/drainer/watch_jobs_test.go | 12 +-- nomad/drainer/watch_nodes.go | 6 +- nomad/drainer/watch_nodes_test.go | 10 +-- nomad/drainer_int_test.go | 14 +-- nomad/drainer_shims.go | 2 +- nomad/encrypter.go | 10 +-- nomad/encrypter_ce.go | 2 +- nomad/encrypter_test.go | 18 ++-- nomad/eval_broker.go | 10 +-- nomad/eval_broker_test.go | 10 +-- nomad/eval_endpoint.go | 10 +-- nomad/eval_endpoint_test.go | 14 +-- nomad/event_endpoint.go | 8 +- nomad/event_endpoint_test.go | 12 +-- nomad/fsm.go | 10 +-- nomad/fsm_test.go | 16 ++-- nomad/heartbeat.go | 4 +- nomad/heartbeat_test.go | 10 +-- nomad/host_volume_endpoint.go | 14 +-- nomad/host_volume_endpoint_ce.go | 4 +- nomad/host_volume_endpoint_test.go | 22 ++--- nomad/job_endpoint.go | 16 ++-- nomad/job_endpoint_ce.go | 2 +- nomad/job_endpoint_ce_test.go | 8 +- nomad/job_endpoint_hook_connect.go | 8 +- nomad/job_endpoint_hook_connect_test.go | 10 +-- nomad/job_endpoint_hook_consul.go | 2 +- nomad/job_endpoint_hook_consul_ce.go | 2 +- nomad/job_endpoint_hook_consul_ce_test.go | 8 +- nomad/job_endpoint_hook_expose_check.go | 2 +- nomad/job_endpoint_hook_expose_check_test.go | 4 +- .../job_endpoint_hook_implicit_identities.go | 2 +- ..._endpoint_hook_implicit_identities_test.go | 6 +- nomad/job_endpoint_hook_node_pool.go | 2 +- nomad/job_endpoint_hook_node_pool_ce.go | 2 +- nomad/job_endpoint_hook_numa_ce.go | 2 +- nomad/job_endpoint_hook_numa_ce_test.go | 6 +- nomad/job_endpoint_hook_sched_ce.go | 2 +- nomad/job_endpoint_hook_vault.go | 2 +- nomad/job_endpoint_hook_vault_ce.go | 2 +- nomad/job_endpoint_hook_vault_ce_test.go | 10 +-- nomad/job_endpoint_hooks.go | 6 +- nomad/job_endpoint_hooks_test.go | 8 +- nomad/job_endpoint_statuses.go | 8 +- nomad/job_endpoint_statuses_test.go | 6 +- nomad/job_endpoint_test.go | 20 ++--- nomad/job_endpoint_validators.go | 2 +- nomad/job_endpoint_validators_test.go | 8 +- nomad/keyring_endpoint.go | 8 +- nomad/keyring_endpoint_test.go | 8 +- nomad/leader.go | 10 +-- nomad/leader_ce.go | 2 +- nomad/leader_test.go | 12 +-- nomad/lock/delay.go | 2 +- nomad/lock/delay_test.go | 2 +- nomad/lock/ttl.go | 2 +- nomad/lock/ttl_test.go | 2 +- nomad/locks.go | 2 +- nomad/locks_test.go | 10 +-- nomad/merge.go | 2 +- nomad/mock/acl.go | 4 +- nomad/mock/alloc.go | 4 +- nomad/mock/connect.go | 6 +- nomad/mock/csi.go | 4 +- nomad/mock/host_volumes.go | 4 +- nomad/mock/job.go | 4 +- nomad/mock/lifecycle.go | 4 +- nomad/mock/mock.go | 4 +- nomad/mock/network.go | 2 +- nomad/mock/node.go | 6 +- nomad/mock/variables.go | 2 +- nomad/namespace_endpoint.go | 4 +- nomad/namespace_endpoint_test.go | 12 +-- nomad/node_endpoint.go | 12 +-- nomad/node_endpoint_test.go | 14 +-- nomad/node_pool_endpoint.go | 8 +- nomad/node_pool_endpoint_ce.go | 2 +- nomad/node_pool_endpoint_test.go | 10 +-- nomad/operator_endpoint.go | 12 +-- nomad/operator_endpoint_test.go | 16 ++-- nomad/peers/peers.go | 2 +- nomad/peers/peers_test.go | 6 +- nomad/periodic.go | 6 +- nomad/periodic_endpoint.go | 4 +- nomad/periodic_endpoint_test.go | 10 +-- nomad/periodic_test.go | 10 +-- nomad/plan_apply.go | 6 +- nomad/plan_apply_ce.go | 4 +- nomad/plan_apply_node_tracker.go | 2 +- nomad/plan_apply_node_tracker_test.go | 2 +- nomad/plan_apply_pool.go | 4 +- nomad/plan_apply_pool_test.go | 6 +- nomad/plan_apply_test.go | 12 +-- nomad/plan_endpoint.go | 2 +- nomad/plan_endpoint_test.go | 8 +- nomad/plan_queue.go | 4 +- nomad/plan_queue_test.go | 6 +- nomad/raft_rpc.go | 4 +- nomad/regions_endpoint.go | 2 +- nomad/regions_endpoint_test.go | 6 +- nomad/rpc.go | 12 +-- nomad/rpc_rate_metrics.go | 2 +- nomad/rpc_test.go | 22 ++--- nomad/scaling_endpoint.go | 6 +- nomad/scaling_endpoint_test.go | 12 +-- nomad/search_endpoint.go | 6 +- nomad/search_endpoint_ce.go | 6 +- nomad/search_endpoint_test.go | 14 +-- nomad/serf.go | 4 +- nomad/serf_test.go | 4 +- nomad/server.go | 40 ++++----- nomad/server_test.go | 12 +-- nomad/service_registration_endpoint.go | 10 +-- nomad/service_registration_endpoint_test.go | 12 +-- nomad/state/autopilot.go | 2 +- nomad/state/autopilot_test.go | 4 +- nomad/state/deployment_events_test.go | 8 +- nomad/state/events.go | 2 +- nomad/state/events_ce.go | 2 +- nomad/state/events_test.go | 8 +- nomad/state/indexer/time_test.go | 2 +- nomad/state/iterator_test.go | 2 +- nomad/state/paginator/filter_test.go | 8 +- nomad/state/paginator/paginator.go | 2 +- nomad/state/paginator/paginator_test.go | 4 +- nomad/state/paginator/tokenizer_test.go | 6 +- nomad/state/schema.go | 4 +- nomad/state/schema_test.go | 6 +- nomad/state/sorting.go | 2 +- nomad/state/sorting_test.go | 4 +- nomad/state/state_changes.go | 4 +- nomad/state/state_store.go | 8 +- nomad/state/state_store_acl.go | 2 +- nomad/state/state_store_acl_binding_rule.go | 2 +- .../state_store_acl_binding_rule_test.go | 8 +- nomad/state/state_store_acl_sso.go | 2 +- nomad/state/state_store_acl_sso_test.go | 6 +- nomad/state/state_store_acl_test.go | 8 +- nomad/state/state_store_ce.go | 2 +- nomad/state/state_store_host_volumes.go | 2 +- nomad/state/state_store_host_volumes_ce.go | 2 +- nomad/state/state_store_host_volumes_test.go | 8 +- nomad/state/state_store_keyring.go | 2 +- nomad/state/state_store_keyring_test.go | 8 +- nomad/state/state_store_node_pools.go | 2 +- nomad/state/state_store_node_pools_test.go | 6 +- nomad/state/state_store_restore.go | 2 +- nomad/state/state_store_restore_test.go | 8 +- .../state/state_store_service_registration.go | 2 +- .../state_store_service_registration_test.go | 6 +- .../state_store_task_group_volume_claims.go | 4 +- ...ate_store_task_group_volume_claims_test.go | 8 +- nomad/state/state_store_test.go | 8 +- nomad/state/state_store_variables.go | 2 +- nomad/state/state_store_variables_test.go | 8 +- nomad/state/testing.go | 8 +- nomad/stats_fetcher.go | 4 +- nomad/stats_fetcher_test.go | 6 +- nomad/status_endpoint.go | 2 +- nomad/status_endpoint_test.go | 12 +-- nomad/stream/event_broker.go | 2 +- nomad/stream/event_broker_test.go | 4 +- nomad/stream/event_buffer.go | 2 +- nomad/stream/event_buffer_test.go | 4 +- nomad/stream/ndjson.go | 2 +- nomad/stream/ndjson_test.go | 2 +- nomad/stream/subscription.go | 2 +- nomad/stream/subscription_test.go | 4 +- nomad/structs/acl.go | 8 +- nomad/structs/acl_test.go | 4 +- nomad/structs/actions_test.go | 2 +- nomad/structs/alloc.go | 8 +- nomad/structs/alloc_test.go | 4 +- nomad/structs/batch_future_test.go | 2 +- nomad/structs/bitmap_test.go | 2 +- nomad/structs/check_test.go | 2 +- nomad/structs/cni_config_test.go | 2 +- nomad/structs/config/artifact.go | 4 +- nomad/structs/config/artifact_test.go | 2 +- nomad/structs/config/audit_test.go | 2 +- nomad/structs/config/autopilot_test.go | 2 +- nomad/structs/config/consul.go | 2 +- nomad/structs/config/consul_test.go | 2 +- nomad/structs/config/drain.go | 2 +- nomad/structs/config/drain_test.go | 2 +- nomad/structs/config/limits_test.go | 2 +- nomad/structs/config/plugins_test.go | 2 +- nomad/structs/config/reporting.go | 2 +- nomad/structs/config/reporting_test.go | 2 +- nomad/structs/config/sentinel.go | 2 +- nomad/structs/config/tls_test.go | 2 +- nomad/structs/config/ui_test.go | 2 +- nomad/structs/config/users.go | 2 +- nomad/structs/config/users_test.go | 2 +- nomad/structs/config/vault.go | 2 +- nomad/structs/config/vault_test.go | 2 +- nomad/structs/config/workload_id.go | 2 +- nomad/structs/config/workload_id_test.go | 2 +- nomad/structs/connect.go | 2 +- nomad/structs/connect_test.go | 2 +- nomad/structs/constraint_test.go | 2 +- nomad/structs/consul_ce_test.go | 2 +- nomad/structs/consul_test.go | 2 +- nomad/structs/cpucompat_default.go | 2 +- nomad/structs/cpucompat_default_test.go | 8 +- nomad/structs/cpucompat_generic.go | 6 +- nomad/structs/cpucompat_linux.go | 8 +- nomad/structs/cpucompat_linux_test.go | 8 +- nomad/structs/csi.go | 2 +- nomad/structs/csi_test.go | 2 +- nomad/structs/deployment.go | 2 +- nomad/structs/devices_test.go | 6 +- nomad/structs/diff.go | 4 +- nomad/structs/diff_test.go | 2 +- nomad/structs/errors_test.go | 2 +- nomad/structs/eval.go | 2 +- nomad/structs/extensions.go | 6 +- nomad/structs/funcs.go | 2 +- nomad/structs/funcs_test.go | 12 +-- nomad/structs/group_test.go | 2 +- nomad/structs/host_volumes.go | 4 +- nomad/structs/host_volumes_test.go | 4 +- nomad/structs/identity_test.go | 2 +- nomad/structs/keyring.go | 6 +- nomad/structs/keyring_test.go | 2 +- nomad/structs/network_test.go | 2 +- nomad/structs/node.go | 2 +- nomad/structs/node_class_test.go | 6 +- nomad/structs/node_pool_ce_test.go | 2 +- nomad/structs/node_pool_test.go | 2 +- nomad/structs/node_test.go | 2 +- nomad/structs/numa.go | 2 +- nomad/structs/numa_test.go | 6 +- nomad/structs/operator_test.go | 2 +- nomad/structs/plan_test.go | 4 +- nomad/structs/service_registration.go | 4 +- nomad/structs/services.go | 6 +- nomad/structs/services_test.go | 2 +- nomad/structs/structs.go | 24 ++--- nomad/structs/structs_ce_test.go | 2 +- nomad/structs/structs_periodic_test.go | 2 +- nomad/structs/structs_test.go | 10 +-- nomad/structs/task_sched_test.go | 2 +- nomad/structs/testing.go | 10 +-- nomad/structs/variables.go | 2 +- nomad/structs/variables_test.go | 2 +- nomad/structs/volumes_test.go | 2 +- nomad/structs/workload_id.go | 2 +- nomad/structs/workload_id_test.go | 4 +- nomad/system_endpoint.go | 2 +- nomad/system_endpoint_test.go | 10 +-- .../task_group_host_volume_claim_endpoint.go | 8 +- ...k_group_host_volume_claim_endpoint_test.go | 10 +-- nomad/testing.go | 14 +-- nomad/util.go | 4 +- nomad/util_test.go | 4 +- nomad/variables_endpoint.go | 10 +-- nomad/variables_endpoint_test.go | 14 +-- nomad/volumewatcher/interfaces.go | 2 +- nomad/volumewatcher/interfaces_test.go | 6 +- nomad/volumewatcher/volume_watcher.go | 6 +- nomad/volumewatcher/volume_watcher_test.go | 10 +-- nomad/volumewatcher/volumes_watcher.go | 4 +- nomad/volumewatcher/volumes_watcher_test.go | 10 +-- nomad/worker.go | 12 +-- nomad/worker_test.go | 18 ++-- plugins/base/base.go | 14 +-- plugins/base/base_test.go | 8 +- plugins/base/client.go | 6 +- plugins/base/plugin.go | 2 +- plugins/base/plugin_test.go | 6 +- plugins/base/proto/base.pb.go | 2 +- plugins/base/server.go | 2 +- plugins/base/testing.go | 2 +- plugins/csi/client.go | 8 +- plugins/csi/client_test.go | 6 +- plugins/csi/fake/client.go | 6 +- plugins/csi/plugin.go | 4 +- plugins/device/client.go | 6 +- plugins/device/cmd/example/cmd/main.go | 4 +- plugins/device/cmd/example/device.go | 8 +- plugins/device/device.go | 4 +- plugins/device/mock.go | 2 +- plugins/device/plugin.go | 6 +- plugins/device/plugin_test.go | 12 +-- plugins/device/proto/device.pb.go | 2 +- plugins/device/server.go | 2 +- plugins/device/util.go | 4 +- plugins/drivers/client.go | 18 ++-- plugins/drivers/cstructs.go | 2 +- plugins/drivers/driver.go | 16 ++-- plugins/drivers/execstreaming.go | 2 +- plugins/drivers/mock.go | 4 +- plugins/drivers/plugin.go | 6 +- plugins/drivers/plugin_test.go | 10 +-- plugins/drivers/proto/driver.pb.go | 4 +- plugins/drivers/server.go | 10 +-- plugins/drivers/task_handle.go | 2 +- plugins/drivers/testutils/dns_testing.go | 6 +- plugins/drivers/testutils/exec_testing.go | 10 +-- plugins/drivers/testutils/testing.go | 24 ++--- plugins/drivers/testutils/testing_linux.go | 2 +- plugins/drivers/testutils/testing_test.go | 8 +- plugins/drivers/utils.go | 4 +- plugins/drivers/utils_test.go | 6 +- plugins/serve.go | 4 +- plugins/shared/cmd/launcher/command/device.go | 8 +- plugins/shared/cmd/launcher/main.go | 2 +- plugins/shared/structs/util.go | 2 +- scheduler/annotate.go | 2 +- scheduler/annotate_test.go | 4 +- scheduler/benchmarks/benchmarks_test.go | 10 +-- scheduler/benchmarks/helpers_test.go | 4 +- scheduler/feasible/context.go | 10 +-- scheduler/feasible/context_test.go | 12 +-- scheduler/feasible/device.go | 6 +- scheduler/feasible/device_test.go | 14 +-- scheduler/feasible/feasible.go | 8 +- scheduler/feasible/feasible_test.go | 16 ++-- scheduler/feasible/numa_ce.go | 8 +- scheduler/feasible/numa_ce_test.go | 8 +- scheduler/feasible/preemption.go | 4 +- scheduler/feasible/preemption_test.go | 12 +-- scheduler/feasible/propertyset.go | 2 +- scheduler/feasible/rank.go | 12 +-- scheduler/feasible/rank_test.go | 16 ++-- scheduler/feasible/select_test.go | 6 +- scheduler/feasible/spread.go | 4 +- scheduler/feasible/spread_test.go | 8 +- scheduler/feasible/stack.go | 2 +- scheduler/feasible/stack_test.go | 6 +- scheduler/generic_sched.go | 12 +-- scheduler/generic_sched_test.go | 16 ++-- scheduler/integration/preemption_test.go | 14 +-- scheduler/integration/spread_test.go | 14 +-- scheduler/reconciler/allocs.go | 2 +- scheduler/reconciler/allocs_test.go | 8 +- scheduler/reconciler/filters.go | 4 +- scheduler/reconciler/filters_test.go | 4 +- scheduler/reconciler/reconcile_cluster.go | 6 +- .../reconciler/reconcile_cluster_prop_test.go | 6 +- .../reconciler/reconcile_cluster_test.go | 12 +-- scheduler/reconciler/reconcile_node.go | 4 +- .../reconciler/reconcile_node_prop_test.go | 2 +- scheduler/reconciler/reconcile_node_test.go | 8 +- scheduler/reconciler/reconnecting_picker.go | 2 +- .../reconciler/reconnecting_picker_test.go | 2 +- scheduler/scheduler.go | 2 +- scheduler/scheduler_sysbatch.go | 10 +-- scheduler/scheduler_sysbatch_test.go | 12 +-- scheduler/scheduler_system.go | 10 +-- scheduler/scheduler_system_test.go | 16 ++-- scheduler/scheduler_test.go | 12 +-- scheduler/structs/interfaces.go | 4 +- scheduler/structs/structs.go | 6 +- scheduler/tests/numa_ce.go | 8 +- scheduler/tests/testing.go | 10 +-- scheduler/util.go | 10 +-- scheduler/util_test.go | 18 ++-- testutil/server.go | 4 +- testutil/tls.go | 2 +- testutil/vault.go | 12 +-- testutil/wait.go | 2 +- tools/buf/buf.gen.yaml | 10 +-- 1396 files changed, 4663 insertions(+), 4664 deletions(-) diff --git a/.github/workflows/test-windows.yml b/.github/workflows/test-windows.yml index ac52da542b7..b8d3b9e8274 100644 --- a/.github/workflows/test-windows.yml +++ b/.github/workflows/test-windows.yml @@ -83,15 +83,15 @@ jobs: export PATH=/c/go/bin:/c/gopath/bin:$PATH gotestsum --format=short-verbose \ --junitfile results.xml \ - github.com/hashicorp/nomad/drivers/docker \ - github.com/hashicorp/nomad/drivers/rawexec \ - github.com/hashicorp/nomad/drivers/shared/executor \ - github.com/hashicorp/nomad/client/lib/fifo \ - github.com/hashicorp/nomad/client/logmon \ - github.com/hashicorp/nomad/client/allocrunner/taskrunner/template \ - github.com/hashicorp/nomad/client/allocrunner/taskrunner/getter \ - github.com/hashicorp/nomad/client/allocdir \ - github.com/hashicorp/nomad/plugins/base + github.com/hashicorp/nomad/v2/drivers/docker \ + github.com/hashicorp/nomad/v2/drivers/rawexec \ + github.com/hashicorp/nomad/v2/drivers/shared/executor \ + github.com/hashicorp/nomad/v2/client/lib/fifo \ + github.com/hashicorp/nomad/v2/client/logmon \ + github.com/hashicorp/nomad/v2/client/allocrunner/taskrunner/template \ + github.com/hashicorp/nomad/v2/client/allocrunner/taskrunner/getter \ + github.com/hashicorp/nomad/v2/client/allocdir \ + github.com/hashicorp/nomad/v2/plugins/base - uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0 with: name: results.xml diff --git a/.semgrep/mpl_busl.yml b/.semgrep/mpl_busl.yml index 231ce4c838f..ae0e57caf2d 100644 --- a/.semgrep/mpl_busl.yml +++ b/.semgrep/mpl_busl.yml @@ -25,7 +25,7 @@ rules: import ... ... - pattern: | - "github.com/hashicorp/nomad/$...B" + "github.com/hashicorp/nomad/v2/$...B" - metavariable-pattern: metavariable: $...B patterns: diff --git a/GNUmakefile b/GNUmakefile index 3b70b4966d6..4479a570780 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -187,13 +187,12 @@ check: ## Lint the source code @echo "==> Check jobspec2 package is isolated from Nomad core..." @cd ./jobspec2 && \ if go list --test -f '{{ join .Deps "\n" }}' . | \ - grep github.com/hashicorp/nomad/ | \ - grep -v -e /nomad/jobspec2/ -e nomad/jobspec2.test | \ - grep -v -e /nomad/api ; then echo \ + grep github.com/hashicorp/nomad/v2 | \ + grep -v -e /nomad/v2/jobspec2/ -e nomad/v2/jobspec2.test ; then echo \ " /jobspec2 package depends the ^^ above internal nomad packages. Remove such dependency"; exit 1; fi @echo "==> Check command package does not import structs..." - @cd ./command && if go list -f '{{ join .Imports "\n" }}' . | grep github.com/hashicorp/nomad/nomad/structs; then echo " /command package imports the structs pkg. Remove such import"; exit 1; fi + @cd ./command && if go list -f '{{ join .Imports "\n" }}' . | grep github.com/hashicorp/nomad/v2/nomad/structs; then echo " /command package imports the structs pkg. Remove such import"; exit 1; fi @echo "==> Checking Go mod..." @GO111MODULE=on $(MAKE) tidy @@ -358,7 +357,7 @@ e2e-test: dev ## Run the Nomad e2e test suite $(if $(ENABLE_RACE),-race) $(if $(VERBOSE),-v) \ -timeout=900s \ -tags "$(GO_TAGS)" \ - github.com/hashicorp/nomad/e2e + github.com/hashicorp/nomad/v2/e2e .PHONY: integration-test integration-test: dev ## Run Nomad integration tests @@ -369,7 +368,7 @@ integration-test: dev ## Run Nomad integration tests -timeout=900s \ -count=1 \ -tags "$(GO_TAGS)" \ - github.com/hashicorp/nomad/e2e/vaultcompat + github.com/hashicorp/nomad/v2/e2e/vaultcompat .PHONY: integration-test-consul integration-test-consul: dev ## Run Nomad integration tests @@ -380,7 +379,7 @@ integration-test-consul: dev ## Run Nomad integration tests -timeout=900s \ -count=1 \ -tags "$(GO_TAGS)" \ - github.com/hashicorp/nomad/e2e/consulcompat + github.com/hashicorp/nomad/v2/e2e/consulcompat .PHONY: integration-test-client-intro integration-test-client-intro: dev ## Run Nomad's Client Intro integration tests @@ -391,7 +390,7 @@ integration-test-client-intro: dev ## Run Nomad's Client Intro integration tests -timeout=120s \ -count=1 \ -tags "$(GO_TAGS)" \ - github.com/hashicorp/nomad/e2e/client_intro + github.com/hashicorp/nomad/v2/e2e/client_intro .PHONY: clean clean: GOPATH=$(shell go env GOPATH) diff --git a/acl/acl_test.go b/acl/acl_test.go index 8f18bda3bc4..cb12d62039c 100644 --- a/acl/acl_test.go +++ b/acl/acl_test.go @@ -6,7 +6,7 @@ package acl import ( "testing" - "github.com/hashicorp/nomad/ci" + "github.com/hashicorp/nomad/v2/ci" "github.com/shoenig/test/must" ) diff --git a/acl/policy_test.go b/acl/policy_test.go index 1ae11e6aadd..0c763f504a6 100644 --- a/acl/policy_test.go +++ b/acl/policy_test.go @@ -10,7 +10,7 @@ import ( "strings" "testing" - "github.com/hashicorp/nomad/ci" + "github.com/hashicorp/nomad/v2/ci" "github.com/shoenig/test" "github.com/shoenig/test/must" ) diff --git a/client/acl.go b/client/acl.go index 86e3265ca2e..7e803aada46 100644 --- a/client/acl.go +++ b/client/acl.go @@ -8,8 +8,8 @@ import ( metrics "github.com/hashicorp/go-metrics/compat" "github.com/hashicorp/go-set/v3" - "github.com/hashicorp/nomad/acl" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/acl" + "github.com/hashicorp/nomad/v2/nomad/structs" ) const ( diff --git a/client/acl_test.go b/client/acl_test.go index 52e2b907d76..9c689bf62d3 100644 --- a/client/acl_test.go +++ b/client/acl_test.go @@ -8,13 +8,13 @@ import ( "testing" "time" - "github.com/hashicorp/nomad/acl" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/client/config" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/testutil" + "github.com/hashicorp/nomad/v2/acl" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/client/config" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/testutil" "github.com/shoenig/test" "github.com/shoenig/test/must" "github.com/shoenig/test/wait" diff --git a/client/agent_endpoint.go b/client/agent_endpoint.go index d6c2735dab9..be20ab15b04 100644 --- a/client/agent_endpoint.go +++ b/client/agent_endpoint.go @@ -13,12 +13,12 @@ import ( log "github.com/hashicorp/go-hclog" metrics "github.com/hashicorp/go-metrics/compat" "github.com/hashicorp/go-msgpack/v2/codec" - sframer "github.com/hashicorp/nomad/client/lib/streamframer" - cstructs "github.com/hashicorp/nomad/client/structs" - "github.com/hashicorp/nomad/command/agent/host" - "github.com/hashicorp/nomad/command/agent/monitor" - "github.com/hashicorp/nomad/command/agent/pprof" - "github.com/hashicorp/nomad/nomad/structs" + sframer "github.com/hashicorp/nomad/v2/client/lib/streamframer" + cstructs "github.com/hashicorp/nomad/v2/client/structs" + "github.com/hashicorp/nomad/v2/command/agent/host" + "github.com/hashicorp/nomad/v2/command/agent/monitor" + "github.com/hashicorp/nomad/v2/command/agent/pprof" + "github.com/hashicorp/nomad/v2/nomad/structs" ) type Agent struct { diff --git a/client/agent_endpoint_test.go b/client/agent_endpoint_test.go index 2e406d6b450..43501fc471f 100644 --- a/client/agent_endpoint_test.go +++ b/client/agent_endpoint_test.go @@ -14,17 +14,17 @@ import ( "time" "github.com/hashicorp/go-msgpack/v2/codec" - "github.com/hashicorp/nomad/acl" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/client/config" - sframer "github.com/hashicorp/nomad/client/lib/streamframer" - cstructs "github.com/hashicorp/nomad/client/structs" - "github.com/hashicorp/nomad/command/agent/monitor" - "github.com/hashicorp/nomad/command/agent/pprof" - "github.com/hashicorp/nomad/nomad" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/testutil" + "github.com/hashicorp/nomad/v2/acl" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/client/config" + sframer "github.com/hashicorp/nomad/v2/client/lib/streamframer" + cstructs "github.com/hashicorp/nomad/v2/client/structs" + "github.com/hashicorp/nomad/v2/command/agent/monitor" + "github.com/hashicorp/nomad/v2/command/agent/pprof" + "github.com/hashicorp/nomad/v2/nomad" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/testutil" "github.com/shoenig/test/must" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/client/alloc_endpoint.go b/client/alloc_endpoint.go index 5b374baf277..2c9e6531017 100644 --- a/client/alloc_endpoint.go +++ b/client/alloc_endpoint.go @@ -14,12 +14,12 @@ import ( metrics "github.com/hashicorp/go-metrics/compat" "github.com/hashicorp/go-msgpack/v2/codec" - "github.com/hashicorp/nomad/acl" - cstructs "github.com/hashicorp/nomad/client/structs" - "github.com/hashicorp/nomad/helper/uuid" - nstructs "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/plugins/drivers" - "github.com/hashicorp/nomad/plugins/drivers/fsisolation" + "github.com/hashicorp/nomad/v2/acl" + cstructs "github.com/hashicorp/nomad/v2/client/structs" + "github.com/hashicorp/nomad/v2/helper/uuid" + nstructs "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/plugins/drivers" + "github.com/hashicorp/nomad/v2/plugins/drivers/fsisolation" ) // Allocations endpoint is used for interacting with client allocations diff --git a/client/alloc_endpoint_test.go b/client/alloc_endpoint_test.go index 8094108c082..2c5b8fa982a 100644 --- a/client/alloc_endpoint_test.go +++ b/client/alloc_endpoint_test.go @@ -14,19 +14,19 @@ import ( "time" "github.com/hashicorp/go-msgpack/v2/codec" - "github.com/hashicorp/nomad/acl" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/client/config" - "github.com/hashicorp/nomad/client/lib/proclib" - cstructs "github.com/hashicorp/nomad/client/structs" - "github.com/hashicorp/nomad/helper/pluginutils/catalog" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/nomad" - "github.com/hashicorp/nomad/nomad/mock" - nstructs "github.com/hashicorp/nomad/nomad/structs" - nconfig "github.com/hashicorp/nomad/nomad/structs/config" - "github.com/hashicorp/nomad/plugins/drivers" - "github.com/hashicorp/nomad/testutil" + "github.com/hashicorp/nomad/v2/acl" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/client/config" + "github.com/hashicorp/nomad/v2/client/lib/proclib" + cstructs "github.com/hashicorp/nomad/v2/client/structs" + "github.com/hashicorp/nomad/v2/helper/pluginutils/catalog" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/nomad" + "github.com/hashicorp/nomad/v2/nomad/mock" + nstructs "github.com/hashicorp/nomad/v2/nomad/structs" + nconfig "github.com/hashicorp/nomad/v2/nomad/structs/config" + "github.com/hashicorp/nomad/v2/plugins/drivers" + "github.com/hashicorp/nomad/v2/testutil" "github.com/shoenig/test/must" "github.com/stretchr/testify/require" "golang.org/x/sys/unix" diff --git a/client/alloc_watcher_e2e_test.go b/client/alloc_watcher_e2e_test.go index 37b48fb2741..3ebf76ade18 100644 --- a/client/alloc_watcher_e2e_test.go +++ b/client/alloc_watcher_e2e_test.go @@ -10,13 +10,13 @@ import ( "path/filepath" "testing" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/command/agent" - "github.com/hashicorp/nomad/nomad" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/nomad/structs/config" - "github.com/hashicorp/nomad/testutil" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/command/agent" + "github.com/hashicorp/nomad/v2/nomad" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/nomad/structs/config" + "github.com/hashicorp/nomad/v2/testutil" "github.com/stretchr/testify/require" ) diff --git a/client/allocdir/alloc_dir.go b/client/allocdir/alloc_dir.go index 4ed372a60ff..078571b49bd 100644 --- a/client/allocdir/alloc_dir.go +++ b/client/allocdir/alloc_dir.go @@ -17,9 +17,9 @@ import ( hclog "github.com/hashicorp/go-hclog" multierror "github.com/hashicorp/go-multierror" - cstructs "github.com/hashicorp/nomad/client/structs" - "github.com/hashicorp/nomad/helper/escapingfs" - "github.com/hashicorp/nomad/nomad/structs" + cstructs "github.com/hashicorp/nomad/v2/client/structs" + "github.com/hashicorp/nomad/v2/helper/escapingfs" + "github.com/hashicorp/nomad/v2/nomad/structs" "github.com/hpcloud/tail/watch" tomb "gopkg.in/tomb.v1" ) diff --git a/client/allocdir/alloc_dir_nonlinux_test.go b/client/allocdir/alloc_dir_nonlinux_test.go index 49778161b34..0c6b376d85b 100644 --- a/client/allocdir/alloc_dir_nonlinux_test.go +++ b/client/allocdir/alloc_dir_nonlinux_test.go @@ -11,10 +11,10 @@ import ( "path/filepath" "testing" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/helper/testlog" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/plugins/drivers/fsisolation" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/helper/testlog" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/plugins/drivers/fsisolation" "github.com/shoenig/test/must" ) diff --git a/client/allocdir/alloc_dir_test.go b/client/allocdir/alloc_dir_test.go index 89e433355c0..c38b14f7d70 100644 --- a/client/allocdir/alloc_dir_test.go +++ b/client/allocdir/alloc_dir_test.go @@ -19,10 +19,10 @@ import ( "syscall" "testing" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/helper/testlog" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/plugins/drivers/fsisolation" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/helper/testlog" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/plugins/drivers/fsisolation" "github.com/shoenig/test/must" "golang.org/x/sys/unix" ) diff --git a/client/allocdir/fs_linux_test.go b/client/allocdir/fs_linux_test.go index e7d1f541e1c..e7f32330452 100644 --- a/client/allocdir/fs_linux_test.go +++ b/client/allocdir/fs_linux_test.go @@ -17,7 +17,7 @@ import ( "strings" "testing" - "github.com/hashicorp/nomad/ci" + "github.com/hashicorp/nomad/v2/ci" "github.com/shoenig/test/must" "golang.org/x/sys/unix" ) diff --git a/client/allocdir/fs_unix.go b/client/allocdir/fs_unix.go index 35a5af46c0f..4be9cffbdb4 100644 --- a/client/allocdir/fs_unix.go +++ b/client/allocdir/fs_unix.go @@ -13,7 +13,7 @@ import ( "strconv" "syscall" - "github.com/hashicorp/nomad/helper/users" + "github.com/hashicorp/nomad/v2/helper/users" "golang.org/x/sys/unix" ) diff --git a/client/allocdir/input/test.go b/client/allocdir/input/test.go index c11db698801..903f3baa999 100644 --- a/client/allocdir/input/test.go +++ b/client/allocdir/input/test.go @@ -4,8 +4,8 @@ package test import ( - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/plugins/device" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/plugins/device" ) type Client interface { diff --git a/client/allocdir/task_dir.go b/client/allocdir/task_dir.go index 2c6be20fed2..abf3974c623 100644 --- a/client/allocdir/task_dir.go +++ b/client/allocdir/task_dir.go @@ -11,8 +11,8 @@ import ( "github.com/hashicorp/go-hclog" "github.com/hashicorp/go-multierror" "github.com/hashicorp/go-set/v3" - "github.com/hashicorp/nomad/helper/users/dynamic" - "github.com/hashicorp/nomad/plugins/drivers/fsisolation" + "github.com/hashicorp/nomad/v2/helper/users/dynamic" + "github.com/hashicorp/nomad/v2/plugins/drivers/fsisolation" ) const ( diff --git a/client/allocdir/task_dir_test.go b/client/allocdir/task_dir_test.go index 751a7e0e41a..6ee50ae70dc 100644 --- a/client/allocdir/task_dir_test.go +++ b/client/allocdir/task_dir_test.go @@ -12,9 +12,9 @@ import ( "path/filepath" "testing" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/helper/testlog" - "github.com/hashicorp/nomad/plugins/drivers/fsisolation" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/helper/testlog" + "github.com/hashicorp/nomad/v2/plugins/drivers/fsisolation" "github.com/shoenig/test/must" ) diff --git a/client/allochealth/tracker.go b/client/allochealth/tracker.go index c2072bb38b7..fed8e963953 100644 --- a/client/allochealth/tracker.go +++ b/client/allochealth/tracker.go @@ -13,12 +13,12 @@ import ( "github.com/hashicorp/consul/api" "github.com/hashicorp/go-hclog" - "github.com/hashicorp/nomad/client/serviceregistration" - "github.com/hashicorp/nomad/client/serviceregistration/checks/checkstore" - cstructs "github.com/hashicorp/nomad/client/structs" - "github.com/hashicorp/nomad/client/taskenv" - "github.com/hashicorp/nomad/helper" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/client/serviceregistration" + "github.com/hashicorp/nomad/v2/client/serviceregistration/checks/checkstore" + cstructs "github.com/hashicorp/nomad/v2/client/structs" + "github.com/hashicorp/nomad/v2/client/taskenv" + "github.com/hashicorp/nomad/v2/helper" + "github.com/hashicorp/nomad/v2/nomad/structs" ) const ( diff --git a/client/allochealth/tracker_test.go b/client/allochealth/tracker_test.go index 769a48a1a47..9a86d038398 100644 --- a/client/allochealth/tracker_test.go +++ b/client/allochealth/tracker_test.go @@ -11,19 +11,19 @@ import ( "time" consulapi "github.com/hashicorp/consul/api" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/client/serviceregistration" - "github.com/hashicorp/nomad/client/serviceregistration/checks/checkstore" - regmock "github.com/hashicorp/nomad/client/serviceregistration/mock" - "github.com/hashicorp/nomad/client/state" - cstructs "github.com/hashicorp/nomad/client/structs" - "github.com/hashicorp/nomad/client/taskenv" - "github.com/hashicorp/nomad/helper" - "github.com/hashicorp/nomad/helper/testlog" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/testutil" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/client/serviceregistration" + "github.com/hashicorp/nomad/v2/client/serviceregistration/checks/checkstore" + regmock "github.com/hashicorp/nomad/v2/client/serviceregistration/mock" + "github.com/hashicorp/nomad/v2/client/state" + cstructs "github.com/hashicorp/nomad/v2/client/structs" + "github.com/hashicorp/nomad/v2/client/taskenv" + "github.com/hashicorp/nomad/v2/helper" + "github.com/hashicorp/nomad/v2/helper/testlog" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/testutil" "github.com/shoenig/test/must" "github.com/shoenig/test/wait" "github.com/stretchr/testify/require" diff --git a/client/allocrunner/alloc_runner.go b/client/allocrunner/alloc_runner.go index 550d82760a7..59ef16266d7 100644 --- a/client/allocrunner/alloc_runner.go +++ b/client/allocrunner/alloc_runner.go @@ -14,35 +14,35 @@ import ( log "github.com/hashicorp/go-hclog" metrics "github.com/hashicorp/go-metrics/compat" multierror "github.com/hashicorp/go-multierror" - "github.com/hashicorp/nomad/client/allocdir" - "github.com/hashicorp/nomad/client/allocrunner/hookstats" - "github.com/hashicorp/nomad/client/allocrunner/interfaces" - "github.com/hashicorp/nomad/client/allocrunner/state" - "github.com/hashicorp/nomad/client/allocrunner/tasklifecycle" - "github.com/hashicorp/nomad/client/allocrunner/taskrunner" - te "github.com/hashicorp/nomad/client/allocrunner/taskrunner/errors" - "github.com/hashicorp/nomad/client/config" - "github.com/hashicorp/nomad/client/consul" - "github.com/hashicorp/nomad/client/devicemanager" - "github.com/hashicorp/nomad/client/dynamicplugins" - cinterfaces "github.com/hashicorp/nomad/client/interfaces" - "github.com/hashicorp/nomad/client/lib/idset" - "github.com/hashicorp/nomad/client/lib/numalib/hw" - "github.com/hashicorp/nomad/client/lib/proclib" - "github.com/hashicorp/nomad/client/pluginmanager/csimanager" - "github.com/hashicorp/nomad/client/pluginmanager/drivermanager" - "github.com/hashicorp/nomad/client/serviceregistration" - "github.com/hashicorp/nomad/client/serviceregistration/checks/checkstore" - "github.com/hashicorp/nomad/client/serviceregistration/wrapper" - cstate "github.com/hashicorp/nomad/client/state" - cstructs "github.com/hashicorp/nomad/client/structs" - "github.com/hashicorp/nomad/client/taskenv" - "github.com/hashicorp/nomad/client/vaultclient" - "github.com/hashicorp/nomad/client/widmgr" - "github.com/hashicorp/nomad/helper/users/dynamic" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/plugins/device" - "github.com/hashicorp/nomad/plugins/drivers" + "github.com/hashicorp/nomad/v2/client/allocdir" + "github.com/hashicorp/nomad/v2/client/allocrunner/hookstats" + "github.com/hashicorp/nomad/v2/client/allocrunner/interfaces" + "github.com/hashicorp/nomad/v2/client/allocrunner/state" + "github.com/hashicorp/nomad/v2/client/allocrunner/tasklifecycle" + "github.com/hashicorp/nomad/v2/client/allocrunner/taskrunner" + te "github.com/hashicorp/nomad/v2/client/allocrunner/taskrunner/errors" + "github.com/hashicorp/nomad/v2/client/config" + "github.com/hashicorp/nomad/v2/client/consul" + "github.com/hashicorp/nomad/v2/client/devicemanager" + "github.com/hashicorp/nomad/v2/client/dynamicplugins" + cinterfaces "github.com/hashicorp/nomad/v2/client/interfaces" + "github.com/hashicorp/nomad/v2/client/lib/idset" + "github.com/hashicorp/nomad/v2/client/lib/numalib/hw" + "github.com/hashicorp/nomad/v2/client/lib/proclib" + "github.com/hashicorp/nomad/v2/client/pluginmanager/csimanager" + "github.com/hashicorp/nomad/v2/client/pluginmanager/drivermanager" + "github.com/hashicorp/nomad/v2/client/serviceregistration" + "github.com/hashicorp/nomad/v2/client/serviceregistration/checks/checkstore" + "github.com/hashicorp/nomad/v2/client/serviceregistration/wrapper" + cstate "github.com/hashicorp/nomad/v2/client/state" + cstructs "github.com/hashicorp/nomad/v2/client/structs" + "github.com/hashicorp/nomad/v2/client/taskenv" + "github.com/hashicorp/nomad/v2/client/vaultclient" + "github.com/hashicorp/nomad/v2/client/widmgr" + "github.com/hashicorp/nomad/v2/helper/users/dynamic" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/plugins/device" + "github.com/hashicorp/nomad/v2/plugins/drivers" ) // allocRunner is used to run all the tasks in a given allocation diff --git a/client/allocrunner/alloc_runner_ce.go b/client/allocrunner/alloc_runner_ce.go index 8f3f8c9235d..8097ef010c3 100644 --- a/client/allocrunner/alloc_runner_ce.go +++ b/client/allocrunner/alloc_runner_ce.go @@ -9,7 +9,7 @@ package allocrunner import ( "fmt" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/nomad/structs" ) func (ar *allocRunner) SetTaskPauseState(string, structs.TaskScheduleState) error { diff --git a/client/allocrunner/alloc_runner_hooks.go b/client/allocrunner/alloc_runner_hooks.go index a801fade63f..76721b83b4f 100644 --- a/client/allocrunner/alloc_runner_hooks.go +++ b/client/allocrunner/alloc_runner_hooks.go @@ -8,12 +8,12 @@ import ( "time" multierror "github.com/hashicorp/go-multierror" - "github.com/hashicorp/nomad/client/allocrunner/interfaces" - clientconfig "github.com/hashicorp/nomad/client/config" - "github.com/hashicorp/nomad/client/consul" - "github.com/hashicorp/nomad/client/taskenv" - "github.com/hashicorp/nomad/helper" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/client/allocrunner/interfaces" + clientconfig "github.com/hashicorp/nomad/v2/client/config" + "github.com/hashicorp/nomad/v2/client/consul" + "github.com/hashicorp/nomad/v2/client/taskenv" + "github.com/hashicorp/nomad/v2/helper" + "github.com/hashicorp/nomad/v2/nomad/structs" ) // allocHealthSetter is a shim to allow the alloc health watcher hook to set diff --git a/client/allocrunner/alloc_runner_test.go b/client/allocrunner/alloc_runner_test.go index 75cf3aaa319..acfe02b091b 100644 --- a/client/allocrunner/alloc_runner_test.go +++ b/client/allocrunner/alloc_runner_test.go @@ -16,24 +16,24 @@ import ( "github.com/hashicorp/consul/api" metrics "github.com/hashicorp/go-metrics/compat" multierror "github.com/hashicorp/go-multierror" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/client/allochealth" - "github.com/hashicorp/nomad/client/allocrunner/hookstats" - "github.com/hashicorp/nomad/client/allocrunner/interfaces" - arstate "github.com/hashicorp/nomad/client/allocrunner/state" - "github.com/hashicorp/nomad/client/allocrunner/tasklifecycle" - "github.com/hashicorp/nomad/client/allocrunner/taskrunner" - "github.com/hashicorp/nomad/client/allocwatcher" - client "github.com/hashicorp/nomad/client/config" - "github.com/hashicorp/nomad/client/lib/proclib" - "github.com/hashicorp/nomad/client/serviceregistration" - regMock "github.com/hashicorp/nomad/client/serviceregistration/mock" - "github.com/hashicorp/nomad/client/state" - cstructs "github.com/hashicorp/nomad/client/structs" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/testutil" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/client/allochealth" + "github.com/hashicorp/nomad/v2/client/allocrunner/hookstats" + "github.com/hashicorp/nomad/v2/client/allocrunner/interfaces" + arstate "github.com/hashicorp/nomad/v2/client/allocrunner/state" + "github.com/hashicorp/nomad/v2/client/allocrunner/tasklifecycle" + "github.com/hashicorp/nomad/v2/client/allocrunner/taskrunner" + "github.com/hashicorp/nomad/v2/client/allocwatcher" + client "github.com/hashicorp/nomad/v2/client/config" + "github.com/hashicorp/nomad/v2/client/lib/proclib" + "github.com/hashicorp/nomad/v2/client/serviceregistration" + regMock "github.com/hashicorp/nomad/v2/client/serviceregistration/mock" + "github.com/hashicorp/nomad/v2/client/state" + cstructs "github.com/hashicorp/nomad/v2/client/structs" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/testutil" "github.com/shoenig/test/must" "github.com/shoenig/test/wait" "github.com/stretchr/testify/require" diff --git a/client/allocrunner/alloc_runner_unix_test.go b/client/allocrunner/alloc_runner_unix_test.go index 77cf854229c..10acce94a66 100644 --- a/client/allocrunner/alloc_runner_unix_test.go +++ b/client/allocrunner/alloc_runner_unix_test.go @@ -13,13 +13,13 @@ import ( "testing" "time" - "github.com/hashicorp/nomad/ci" - regMock "github.com/hashicorp/nomad/client/serviceregistration/mock" - "github.com/hashicorp/nomad/client/state" - "github.com/hashicorp/nomad/client/taskenv" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/testutil" + "github.com/hashicorp/nomad/v2/ci" + regMock "github.com/hashicorp/nomad/v2/client/serviceregistration/mock" + "github.com/hashicorp/nomad/v2/client/state" + "github.com/hashicorp/nomad/v2/client/taskenv" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/testutil" "github.com/shoenig/test/must" "github.com/stretchr/testify/require" ) diff --git a/client/allocrunner/allocdir_hook.go b/client/allocrunner/allocdir_hook.go index 8cb2198e903..46076580ebd 100644 --- a/client/allocrunner/allocdir_hook.go +++ b/client/allocrunner/allocdir_hook.go @@ -5,9 +5,9 @@ package allocrunner import ( "github.com/hashicorp/go-hclog" - "github.com/hashicorp/nomad/client/allocdir" - "github.com/hashicorp/nomad/client/allocrunner/interfaces" - "github.com/hashicorp/nomad/client/taskenv" + "github.com/hashicorp/nomad/v2/client/allocdir" + "github.com/hashicorp/nomad/v2/client/allocrunner/interfaces" + "github.com/hashicorp/nomad/v2/client/taskenv" ) // allocDirHook creates and destroys the root directory and shared directories diff --git a/client/allocrunner/checks_hook.go b/client/allocrunner/checks_hook.go index 518c8a93b18..62e5ba13e0b 100644 --- a/client/allocrunner/checks_hook.go +++ b/client/allocrunner/checks_hook.go @@ -9,12 +9,12 @@ import ( "time" "github.com/hashicorp/go-hclog" - "github.com/hashicorp/nomad/client/allocrunner/interfaces" - "github.com/hashicorp/nomad/client/serviceregistration/checks" - "github.com/hashicorp/nomad/client/serviceregistration/checks/checkstore" - "github.com/hashicorp/nomad/client/taskenv" - "github.com/hashicorp/nomad/helper" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/client/allocrunner/interfaces" + "github.com/hashicorp/nomad/v2/client/serviceregistration/checks" + "github.com/hashicorp/nomad/v2/client/serviceregistration/checks/checkstore" + "github.com/hashicorp/nomad/v2/client/taskenv" + "github.com/hashicorp/nomad/v2/helper" + "github.com/hashicorp/nomad/v2/nomad/structs" ) const ( diff --git a/client/allocrunner/checks_hook_test.go b/client/allocrunner/checks_hook_test.go index cb34071e189..8aa5300af34 100644 --- a/client/allocrunner/checks_hook_test.go +++ b/client/allocrunner/checks_hook_test.go @@ -13,15 +13,15 @@ import ( "time" "github.com/hashicorp/go-hclog" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/client/allocrunner/interfaces" - "github.com/hashicorp/nomad/client/serviceregistration/checks/checkstore" - "github.com/hashicorp/nomad/client/state" - "github.com/hashicorp/nomad/client/taskenv" - "github.com/hashicorp/nomad/helper/testlog" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/testutil" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/client/allocrunner/interfaces" + "github.com/hashicorp/nomad/v2/client/serviceregistration/checks/checkstore" + "github.com/hashicorp/nomad/v2/client/state" + "github.com/hashicorp/nomad/v2/client/taskenv" + "github.com/hashicorp/nomad/v2/helper/testlog" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/testutil" "github.com/shoenig/test/must" ) diff --git a/client/allocrunner/consul_grpc_sock_hook.go b/client/allocrunner/consul_grpc_sock_hook.go index e6ee85e298f..e2a15633b82 100644 --- a/client/allocrunner/consul_grpc_sock_hook.go +++ b/client/allocrunner/consul_grpc_sock_hook.go @@ -19,11 +19,11 @@ import ( multierror "github.com/hashicorp/go-multierror" "github.com/hashicorp/go-secure-stdlib/listenerutil" "github.com/hashicorp/go-set/v3" - "github.com/hashicorp/nomad/client/allocdir" - "github.com/hashicorp/nomad/client/allocrunner/interfaces" - "github.com/hashicorp/nomad/client/taskenv" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/nomad/structs/config" + "github.com/hashicorp/nomad/v2/client/allocdir" + "github.com/hashicorp/nomad/v2/client/allocrunner/interfaces" + "github.com/hashicorp/nomad/v2/client/taskenv" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/nomad/structs/config" ) const ( diff --git a/client/allocrunner/consul_grpc_sock_hook_test.go b/client/allocrunner/consul_grpc_sock_hook_test.go index a248245bf6c..5df3260a725 100644 --- a/client/allocrunner/consul_grpc_sock_hook_test.go +++ b/client/allocrunner/consul_grpc_sock_hook_test.go @@ -12,13 +12,13 @@ import ( "sync" "testing" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/client/allocdir" - "github.com/hashicorp/nomad/client/allocrunner/interfaces" - "github.com/hashicorp/nomad/helper/testlog" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/nomad/structs/config" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/client/allocdir" + "github.com/hashicorp/nomad/v2/client/allocrunner/interfaces" + "github.com/hashicorp/nomad/v2/helper/testlog" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/nomad/structs/config" "github.com/shoenig/test/must" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/client/allocrunner/consul_hook.go b/client/allocrunner/consul_hook.go index bbc02e8e874..8a53d827e2f 100644 --- a/client/allocrunner/consul_hook.go +++ b/client/allocrunner/consul_hook.go @@ -12,15 +12,15 @@ import ( consulapi "github.com/hashicorp/consul/api" log "github.com/hashicorp/go-hclog" "github.com/hashicorp/go-multierror" - "github.com/hashicorp/nomad/client/allocdir" - "github.com/hashicorp/nomad/client/allocrunner/interfaces" - "github.com/hashicorp/nomad/client/consul" - cstate "github.com/hashicorp/nomad/client/state" - cstructs "github.com/hashicorp/nomad/client/structs" - "github.com/hashicorp/nomad/client/taskenv" - "github.com/hashicorp/nomad/client/widmgr" - "github.com/hashicorp/nomad/nomad/structs" - structsc "github.com/hashicorp/nomad/nomad/structs/config" + "github.com/hashicorp/nomad/v2/client/allocdir" + "github.com/hashicorp/nomad/v2/client/allocrunner/interfaces" + "github.com/hashicorp/nomad/v2/client/consul" + cstate "github.com/hashicorp/nomad/v2/client/state" + cstructs "github.com/hashicorp/nomad/v2/client/structs" + "github.com/hashicorp/nomad/v2/client/taskenv" + "github.com/hashicorp/nomad/v2/client/widmgr" + "github.com/hashicorp/nomad/v2/nomad/structs" + structsc "github.com/hashicorp/nomad/v2/nomad/structs/config" ) type consulHook struct { diff --git a/client/allocrunner/consul_hook_test.go b/client/allocrunner/consul_hook_test.go index a104b373987..5eece3bdc9a 100644 --- a/client/allocrunner/consul_hook_test.go +++ b/client/allocrunner/consul_hook_test.go @@ -10,16 +10,16 @@ import ( "testing" consulapi "github.com/hashicorp/consul/api" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/client/consul" - cstate "github.com/hashicorp/nomad/client/state" - cstructs "github.com/hashicorp/nomad/client/structs" - "github.com/hashicorp/nomad/client/taskenv" - "github.com/hashicorp/nomad/client/widmgr" - "github.com/hashicorp/nomad/helper/testlog" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" - structsc "github.com/hashicorp/nomad/nomad/structs/config" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/client/consul" + cstate "github.com/hashicorp/nomad/v2/client/state" + cstructs "github.com/hashicorp/nomad/v2/client/structs" + "github.com/hashicorp/nomad/v2/client/taskenv" + "github.com/hashicorp/nomad/v2/client/widmgr" + "github.com/hashicorp/nomad/v2/helper/testlog" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" + structsc "github.com/hashicorp/nomad/v2/nomad/structs/config" "github.com/shoenig/test/must" ) diff --git a/client/allocrunner/consul_http_sock_hook.go b/client/allocrunner/consul_http_sock_hook.go index 1d41c80f5e5..8105ae61331 100644 --- a/client/allocrunner/consul_http_sock_hook.go +++ b/client/allocrunner/consul_http_sock_hook.go @@ -17,11 +17,11 @@ import ( "github.com/hashicorp/go-hclog" multierror "github.com/hashicorp/go-multierror" "github.com/hashicorp/go-set/v3" - "github.com/hashicorp/nomad/client/allocdir" - "github.com/hashicorp/nomad/client/allocrunner/interfaces" - "github.com/hashicorp/nomad/client/taskenv" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/nomad/structs/config" + "github.com/hashicorp/nomad/v2/client/allocdir" + "github.com/hashicorp/nomad/v2/client/allocrunner/interfaces" + "github.com/hashicorp/nomad/v2/client/taskenv" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/nomad/structs/config" ) func tgFirstNetworkCanConsulConnect(tg *structs.TaskGroup) bool { diff --git a/client/allocrunner/consul_http_sock_hook_test.go b/client/allocrunner/consul_http_sock_hook_test.go index 454227e5390..6a617e10546 100644 --- a/client/allocrunner/consul_http_sock_hook_test.go +++ b/client/allocrunner/consul_http_sock_hook_test.go @@ -9,12 +9,12 @@ import ( "path/filepath" "testing" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/client/allocdir" - "github.com/hashicorp/nomad/helper/testlog" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/nomad/structs/config" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/client/allocdir" + "github.com/hashicorp/nomad/v2/helper/testlog" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/nomad/structs/config" "github.com/shoenig/test/must" "github.com/stretchr/testify/require" ) diff --git a/client/allocrunner/cpuparts_hook.go b/client/allocrunner/cpuparts_hook.go index 4286ca93403..eea11830a52 100644 --- a/client/allocrunner/cpuparts_hook.go +++ b/client/allocrunner/cpuparts_hook.go @@ -5,12 +5,12 @@ package allocrunner import ( "github.com/hashicorp/go-hclog" - "github.com/hashicorp/nomad/client/allocrunner/interfaces" - "github.com/hashicorp/nomad/client/lib/cgroupslib" - "github.com/hashicorp/nomad/client/lib/idset" - "github.com/hashicorp/nomad/client/lib/numalib/hw" - "github.com/hashicorp/nomad/client/taskenv" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/client/allocrunner/interfaces" + "github.com/hashicorp/nomad/v2/client/lib/cgroupslib" + "github.com/hashicorp/nomad/v2/client/lib/idset" + "github.com/hashicorp/nomad/v2/client/lib/numalib/hw" + "github.com/hashicorp/nomad/v2/client/taskenv" + "github.com/hashicorp/nomad/v2/nomad/structs" ) const ( diff --git a/client/allocrunner/csi_hook.go b/client/allocrunner/csi_hook.go index 683db90225a..a6e3764ea73 100644 --- a/client/allocrunner/csi_hook.go +++ b/client/allocrunner/csi_hook.go @@ -12,16 +12,16 @@ import ( hclog "github.com/hashicorp/go-hclog" multierror "github.com/hashicorp/go-multierror" - "github.com/hashicorp/nomad/client/allocrunner/interfaces" - "github.com/hashicorp/nomad/client/allocrunner/state" - "github.com/hashicorp/nomad/client/config" - "github.com/hashicorp/nomad/client/dynamicplugins" - "github.com/hashicorp/nomad/client/pluginmanager/csimanager" - cstructs "github.com/hashicorp/nomad/client/structs" - "github.com/hashicorp/nomad/client/taskenv" - "github.com/hashicorp/nomad/helper" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/plugins/drivers" + "github.com/hashicorp/nomad/v2/client/allocrunner/interfaces" + "github.com/hashicorp/nomad/v2/client/allocrunner/state" + "github.com/hashicorp/nomad/v2/client/config" + "github.com/hashicorp/nomad/v2/client/dynamicplugins" + "github.com/hashicorp/nomad/v2/client/pluginmanager/csimanager" + cstructs "github.com/hashicorp/nomad/v2/client/structs" + "github.com/hashicorp/nomad/v2/client/taskenv" + "github.com/hashicorp/nomad/v2/helper" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/plugins/drivers" ) // csiHook will wait for remote csi volumes to be attached to the host before diff --git a/client/allocrunner/csi_hook_test.go b/client/allocrunner/csi_hook_test.go index da44eca4bf2..e07f0e48dfa 100644 --- a/client/allocrunner/csi_hook_test.go +++ b/client/allocrunner/csi_hook_test.go @@ -10,15 +10,15 @@ import ( "testing" "time" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/client/allocrunner/state" - "github.com/hashicorp/nomad/client/pluginmanager/csimanager" - cstructs "github.com/hashicorp/nomad/client/structs" - "github.com/hashicorp/nomad/helper/testlog" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/plugins/drivers" - "github.com/hashicorp/nomad/testutil" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/client/allocrunner/state" + "github.com/hashicorp/nomad/v2/client/pluginmanager/csimanager" + cstructs "github.com/hashicorp/nomad/v2/client/structs" + "github.com/hashicorp/nomad/v2/helper/testlog" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/plugins/drivers" + "github.com/hashicorp/nomad/v2/testutil" "github.com/shoenig/test/must" ) diff --git a/client/allocrunner/fail_hook.go b/client/allocrunner/fail_hook.go index da01e0f6a47..14ccdf74b55 100644 --- a/client/allocrunner/fail_hook.go +++ b/client/allocrunner/fail_hook.go @@ -15,8 +15,8 @@ import ( "github.com/hashicorp/go-hclog" "github.com/hashicorp/hcl/v2/hclsimple" - "github.com/hashicorp/nomad/client/allocrunner/interfaces" - "github.com/hashicorp/nomad/client/taskenv" + "github.com/hashicorp/nomad/v2/client/allocrunner/interfaces" + "github.com/hashicorp/nomad/v2/client/taskenv" ) var ErrFailHookError = errors.New("failed successfully") diff --git a/client/allocrunner/group_service_hook.go b/client/allocrunner/group_service_hook.go index 76284a79336..0501a3c02ae 100644 --- a/client/allocrunner/group_service_hook.go +++ b/client/allocrunner/group_service_hook.go @@ -9,14 +9,14 @@ import ( "time" "github.com/hashicorp/go-hclog" - "github.com/hashicorp/nomad/client/allocrunner/interfaces" - "github.com/hashicorp/nomad/client/serviceregistration" - "github.com/hashicorp/nomad/client/serviceregistration/wrapper" - cstructs "github.com/hashicorp/nomad/client/structs" - "github.com/hashicorp/nomad/client/taskenv" - "github.com/hashicorp/nomad/command/agent/consul" - "github.com/hashicorp/nomad/helper" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/client/allocrunner/interfaces" + "github.com/hashicorp/nomad/v2/client/serviceregistration" + "github.com/hashicorp/nomad/v2/client/serviceregistration/wrapper" + cstructs "github.com/hashicorp/nomad/v2/client/structs" + "github.com/hashicorp/nomad/v2/client/taskenv" + "github.com/hashicorp/nomad/v2/command/agent/consul" + "github.com/hashicorp/nomad/v2/helper" + "github.com/hashicorp/nomad/v2/nomad/structs" ) const ( diff --git a/client/allocrunner/group_service_hook_test.go b/client/allocrunner/group_service_hook_test.go index 5622e718177..bec3835f000 100644 --- a/client/allocrunner/group_service_hook_test.go +++ b/client/allocrunner/group_service_hook_test.go @@ -8,16 +8,16 @@ import ( "testing" "time" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/client/allocrunner/interfaces" - regMock "github.com/hashicorp/nomad/client/serviceregistration/mock" - "github.com/hashicorp/nomad/client/serviceregistration/wrapper" - cstructs "github.com/hashicorp/nomad/client/structs" - "github.com/hashicorp/nomad/client/taskenv" - agentconsul "github.com/hashicorp/nomad/command/agent/consul" - "github.com/hashicorp/nomad/helper/testlog" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/client/allocrunner/interfaces" + regMock "github.com/hashicorp/nomad/v2/client/serviceregistration/mock" + "github.com/hashicorp/nomad/v2/client/serviceregistration/wrapper" + cstructs "github.com/hashicorp/nomad/v2/client/structs" + "github.com/hashicorp/nomad/v2/client/taskenv" + agentconsul "github.com/hashicorp/nomad/v2/command/agent/consul" + "github.com/hashicorp/nomad/v2/helper/testlog" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" "github.com/shoenig/test/must" ) diff --git a/client/allocrunner/health_hook.go b/client/allocrunner/health_hook.go index e9daf96339e..838c778035e 100644 --- a/client/allocrunner/health_hook.go +++ b/client/allocrunner/health_hook.go @@ -10,13 +10,13 @@ import ( "time" "github.com/hashicorp/go-hclog" - "github.com/hashicorp/nomad/client/allochealth" - "github.com/hashicorp/nomad/client/allocrunner/interfaces" - "github.com/hashicorp/nomad/client/serviceregistration" - "github.com/hashicorp/nomad/client/serviceregistration/checks/checkstore" - cstructs "github.com/hashicorp/nomad/client/structs" - "github.com/hashicorp/nomad/client/taskenv" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/client/allochealth" + "github.com/hashicorp/nomad/v2/client/allocrunner/interfaces" + "github.com/hashicorp/nomad/v2/client/serviceregistration" + "github.com/hashicorp/nomad/v2/client/serviceregistration/checks/checkstore" + cstructs "github.com/hashicorp/nomad/v2/client/structs" + "github.com/hashicorp/nomad/v2/client/taskenv" + "github.com/hashicorp/nomad/v2/nomad/structs" ) // healthSetter is able to set/clear alloc health. diff --git a/client/allocrunner/health_hook_test.go b/client/allocrunner/health_hook_test.go index b11e3672a18..c17d895e339 100644 --- a/client/allocrunner/health_hook_test.go +++ b/client/allocrunner/health_hook_test.go @@ -9,18 +9,18 @@ import ( "time" consulapi "github.com/hashicorp/consul/api" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/client/allocrunner/interfaces" - "github.com/hashicorp/nomad/client/serviceregistration" - "github.com/hashicorp/nomad/client/serviceregistration/checks/checkstore" - regMock "github.com/hashicorp/nomad/client/serviceregistration/mock" - "github.com/hashicorp/nomad/client/state" - cstructs "github.com/hashicorp/nomad/client/structs" - "github.com/hashicorp/nomad/client/taskenv" - "github.com/hashicorp/nomad/helper/testlog" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/client/allocrunner/interfaces" + "github.com/hashicorp/nomad/v2/client/serviceregistration" + "github.com/hashicorp/nomad/v2/client/serviceregistration/checks/checkstore" + regMock "github.com/hashicorp/nomad/v2/client/serviceregistration/mock" + "github.com/hashicorp/nomad/v2/client/state" + cstructs "github.com/hashicorp/nomad/v2/client/structs" + "github.com/hashicorp/nomad/v2/client/taskenv" + "github.com/hashicorp/nomad/v2/helper/testlog" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" "github.com/shoenig/test" "github.com/shoenig/test/must" ) diff --git a/client/allocrunner/hookstats/hookstats.go b/client/allocrunner/hookstats/hookstats.go index 5f5b1eedaf9..6626d7703ff 100644 --- a/client/allocrunner/hookstats/hookstats.go +++ b/client/allocrunner/hookstats/hookstats.go @@ -7,7 +7,7 @@ import ( "time" metrics "github.com/hashicorp/go-metrics/compat" - "github.com/hashicorp/nomad/client/allocrunner/interfaces" + "github.com/hashicorp/nomad/v2/client/allocrunner/interfaces" ) // Handler implements interfaces.HookStatsHandler and is used when the operator diff --git a/client/allocrunner/hookstats/hookstats_test.go b/client/allocrunner/hookstats/hookstats_test.go index ee5c3d44299..e7d722973b4 100644 --- a/client/allocrunner/hookstats/hookstats_test.go +++ b/client/allocrunner/hookstats/hookstats_test.go @@ -9,7 +9,7 @@ import ( "time" metrics "github.com/hashicorp/go-metrics/compat" - "github.com/hashicorp/nomad/ci" + "github.com/hashicorp/nomad/v2/ci" "github.com/shoenig/test/must" ) diff --git a/client/allocrunner/identity_hook.go b/client/allocrunner/identity_hook.go index 50367bf7078..15c0bd4296f 100644 --- a/client/allocrunner/identity_hook.go +++ b/client/allocrunner/identity_hook.go @@ -5,9 +5,9 @@ package allocrunner import ( log "github.com/hashicorp/go-hclog" - "github.com/hashicorp/nomad/client/allocrunner/interfaces" - "github.com/hashicorp/nomad/client/taskenv" - "github.com/hashicorp/nomad/client/widmgr" + "github.com/hashicorp/nomad/v2/client/allocrunner/interfaces" + "github.com/hashicorp/nomad/v2/client/taskenv" + "github.com/hashicorp/nomad/v2/client/widmgr" ) type identityHook struct { diff --git a/client/allocrunner/identity_hook_test.go b/client/allocrunner/identity_hook_test.go index f64ec120702..68a66cf718c 100644 --- a/client/allocrunner/identity_hook_test.go +++ b/client/allocrunner/identity_hook_test.go @@ -7,13 +7,13 @@ import ( "testing" "time" - "github.com/hashicorp/nomad/ci" - cstate "github.com/hashicorp/nomad/client/state" - "github.com/hashicorp/nomad/client/taskenv" - "github.com/hashicorp/nomad/client/widmgr" - "github.com/hashicorp/nomad/helper/testlog" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/ci" + cstate "github.com/hashicorp/nomad/v2/client/state" + "github.com/hashicorp/nomad/v2/client/taskenv" + "github.com/hashicorp/nomad/v2/client/widmgr" + "github.com/hashicorp/nomad/v2/helper/testlog" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" "github.com/shoenig/test/must" ) diff --git a/client/allocrunner/interfaces/runner.go b/client/allocrunner/interfaces/runner.go index b34db444282..5da1590ce51 100644 --- a/client/allocrunner/interfaces/runner.go +++ b/client/allocrunner/interfaces/runner.go @@ -6,13 +6,13 @@ package interfaces import ( "time" - "github.com/hashicorp/nomad/client/allocdir" - "github.com/hashicorp/nomad/client/allocrunner/state" - "github.com/hashicorp/nomad/client/pluginmanager/csimanager" - "github.com/hashicorp/nomad/client/pluginmanager/drivermanager" - cstructs "github.com/hashicorp/nomad/client/structs" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/plugins/drivers" + "github.com/hashicorp/nomad/v2/client/allocdir" + "github.com/hashicorp/nomad/v2/client/allocrunner/state" + "github.com/hashicorp/nomad/v2/client/pluginmanager/csimanager" + "github.com/hashicorp/nomad/v2/client/pluginmanager/drivermanager" + cstructs "github.com/hashicorp/nomad/v2/client/structs" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/plugins/drivers" ) // AllocRunner is the interface to the allocRunner struct used by client.Client diff --git a/client/allocrunner/interfaces/runner_lifecycle.go b/client/allocrunner/interfaces/runner_lifecycle.go index fd0d6b91832..03540df7c38 100644 --- a/client/allocrunner/interfaces/runner_lifecycle.go +++ b/client/allocrunner/interfaces/runner_lifecycle.go @@ -4,8 +4,8 @@ package interfaces import ( - "github.com/hashicorp/nomad/client/taskenv" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/client/taskenv" + "github.com/hashicorp/nomad/v2/nomad/structs" ) // RunnerHook is a lifecycle hook into the life cycle of an allocation runner. diff --git a/client/allocrunner/interfaces/task_lifecycle.go b/client/allocrunner/interfaces/task_lifecycle.go index e48287f5357..cfac904e4e6 100644 --- a/client/allocrunner/interfaces/task_lifecycle.go +++ b/client/allocrunner/interfaces/task_lifecycle.go @@ -7,12 +7,12 @@ import ( "context" "time" - "github.com/hashicorp/nomad/client/allocdir" - "github.com/hashicorp/nomad/client/allocrunner/taskrunner/interfaces" - cstructs "github.com/hashicorp/nomad/client/structs" - "github.com/hashicorp/nomad/client/taskenv" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/plugins/drivers" + "github.com/hashicorp/nomad/v2/client/allocdir" + "github.com/hashicorp/nomad/v2/client/allocrunner/taskrunner/interfaces" + cstructs "github.com/hashicorp/nomad/v2/client/structs" + "github.com/hashicorp/nomad/v2/client/taskenv" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/plugins/drivers" ) /* diff --git a/client/allocrunner/max_run_duration_hook.go b/client/allocrunner/max_run_duration_hook.go index e77d36afd04..c48833db00c 100644 --- a/client/allocrunner/max_run_duration_hook.go +++ b/client/allocrunner/max_run_duration_hook.go @@ -9,9 +9,9 @@ import ( "github.com/hashicorp/go-hclog" metrics "github.com/hashicorp/go-metrics/compat" - "github.com/hashicorp/nomad/client/allocrunner/interfaces" - "github.com/hashicorp/nomad/client/taskenv" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/client/allocrunner/interfaces" + "github.com/hashicorp/nomad/v2/client/taskenv" + "github.com/hashicorp/nomad/v2/nomad/structs" ) var ( diff --git a/client/allocrunner/max_run_duration_hook_test.go b/client/allocrunner/max_run_duration_hook_test.go index 43d5f91f5e8..fc98b791a0c 100644 --- a/client/allocrunner/max_run_duration_hook_test.go +++ b/client/allocrunner/max_run_duration_hook_test.go @@ -10,11 +10,11 @@ import ( log "github.com/hashicorp/go-hclog" metrics "github.com/hashicorp/go-metrics/compat" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/client/allocrunner/interfaces" - "github.com/hashicorp/nomad/client/taskenv" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/client/allocrunner/interfaces" + "github.com/hashicorp/nomad/v2/client/taskenv" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" "github.com/shoenig/test/must" ) diff --git a/client/allocrunner/migrate_hook.go b/client/allocrunner/migrate_hook.go index 432c168f1da..b2d543c52b7 100644 --- a/client/allocrunner/migrate_hook.go +++ b/client/allocrunner/migrate_hook.go @@ -8,10 +8,10 @@ import ( "fmt" log "github.com/hashicorp/go-hclog" - "github.com/hashicorp/nomad/client/allocdir" - "github.com/hashicorp/nomad/client/allocrunner/interfaces" - "github.com/hashicorp/nomad/client/config" - "github.com/hashicorp/nomad/client/taskenv" + "github.com/hashicorp/nomad/v2/client/allocdir" + "github.com/hashicorp/nomad/v2/client/allocrunner/interfaces" + "github.com/hashicorp/nomad/v2/client/config" + "github.com/hashicorp/nomad/v2/client/taskenv" ) // diskMigrationHook migrates ephemeral disk volumes. Depends on alloc dir diff --git a/client/allocrunner/network_hook.go b/client/allocrunner/network_hook.go index 4fcd7617ef6..0bb9d71fb19 100644 --- a/client/allocrunner/network_hook.go +++ b/client/allocrunner/network_hook.go @@ -9,10 +9,10 @@ import ( "fmt" hclog "github.com/hashicorp/go-hclog" - "github.com/hashicorp/nomad/client/allocrunner/interfaces" - "github.com/hashicorp/nomad/client/taskenv" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/plugins/drivers" + "github.com/hashicorp/nomad/v2/client/allocrunner/interfaces" + "github.com/hashicorp/nomad/v2/client/taskenv" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/plugins/drivers" "github.com/miekg/dns" ) diff --git a/client/allocrunner/network_hook_linux_test.go b/client/allocrunner/network_hook_linux_test.go index a2b888d60ea..d9f630c9d4f 100644 --- a/client/allocrunner/network_hook_linux_test.go +++ b/client/allocrunner/network_hook_linux_test.go @@ -10,14 +10,14 @@ import ( "fmt" "testing" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/client/taskenv" - "github.com/hashicorp/nomad/helper/testlog" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/plugins/drivers" - "github.com/hashicorp/nomad/plugins/drivers/testutils" - "github.com/hashicorp/nomad/testutil" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/client/taskenv" + "github.com/hashicorp/nomad/v2/helper/testlog" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/plugins/drivers" + "github.com/hashicorp/nomad/v2/plugins/drivers/testutils" + "github.com/hashicorp/nomad/v2/testutil" "github.com/shoenig/test" "github.com/shoenig/test/must" ) diff --git a/client/allocrunner/network_hook_test.go b/client/allocrunner/network_hook_test.go index ad756e3efdc..f57058c9d87 100644 --- a/client/allocrunner/network_hook_test.go +++ b/client/allocrunner/network_hook_test.go @@ -6,13 +6,13 @@ package allocrunner import ( "testing" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/client/taskenv" - "github.com/hashicorp/nomad/helper/testlog" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/plugins/drivers" - "github.com/hashicorp/nomad/plugins/drivers/testutils" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/client/taskenv" + "github.com/hashicorp/nomad/v2/helper/testlog" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/plugins/drivers" + "github.com/hashicorp/nomad/v2/plugins/drivers/testutils" "github.com/shoenig/test" "github.com/shoenig/test/must" ) diff --git a/client/allocrunner/network_manager_linux.go b/client/allocrunner/network_manager_linux.go index baeaf48dd82..8433c568222 100644 --- a/client/allocrunner/network_manager_linux.go +++ b/client/allocrunner/network_manager_linux.go @@ -11,11 +11,11 @@ import ( "syscall" hclog "github.com/hashicorp/go-hclog" - clientconfig "github.com/hashicorp/nomad/client/config" - "github.com/hashicorp/nomad/client/lib/nsutil" - "github.com/hashicorp/nomad/client/pluginmanager/drivermanager" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/plugins/drivers" + clientconfig "github.com/hashicorp/nomad/v2/client/config" + "github.com/hashicorp/nomad/v2/client/lib/nsutil" + "github.com/hashicorp/nomad/v2/client/pluginmanager/drivermanager" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/plugins/drivers" ) func newNetworkManager(alloc *structs.Allocation, driverManager drivermanager.Manager) (nm drivers.DriverNetworkManager, err error) { diff --git a/client/allocrunner/network_manager_linux_test.go b/client/allocrunner/network_manager_linux_test.go index edb2887b412..536b93f601d 100644 --- a/client/allocrunner/network_manager_linux_test.go +++ b/client/allocrunner/network_manager_linux_test.go @@ -6,11 +6,11 @@ package allocrunner import ( "testing" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/client/pluginmanager" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/plugins/drivers" - "github.com/hashicorp/nomad/plugins/drivers/testutils" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/client/pluginmanager" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/plugins/drivers" + "github.com/hashicorp/nomad/v2/plugins/drivers/testutils" "github.com/stretchr/testify/require" ) diff --git a/client/allocrunner/network_manager_nonlinux.go b/client/allocrunner/network_manager_nonlinux.go index 380e052f693..b79822753fd 100644 --- a/client/allocrunner/network_manager_nonlinux.go +++ b/client/allocrunner/network_manager_nonlinux.go @@ -8,10 +8,10 @@ package allocrunner import ( hclog "github.com/hashicorp/go-hclog" - clientconfig "github.com/hashicorp/nomad/client/config" - "github.com/hashicorp/nomad/client/pluginmanager/drivermanager" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/plugins/drivers" + clientconfig "github.com/hashicorp/nomad/v2/client/config" + "github.com/hashicorp/nomad/v2/client/pluginmanager/drivermanager" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/plugins/drivers" ) // noopNetworkManager implements the drivers.DriverNetoworkManager interface to diff --git a/client/allocrunner/networking.go b/client/allocrunner/networking.go index a264811b523..99f8ee368e4 100644 --- a/client/allocrunner/networking.go +++ b/client/allocrunner/networking.go @@ -7,8 +7,8 @@ import ( "context" "sync" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/plugins/drivers" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/plugins/drivers" ) // NetworkConfigurator sets up and tears down the interfaces, routes, firewall diff --git a/client/allocrunner/networking_bridge_linux.go b/client/allocrunner/networking_bridge_linux.go index 7bfb024e528..ac3ebf7de0b 100644 --- a/client/allocrunner/networking_bridge_linux.go +++ b/client/allocrunner/networking_bridge_linux.go @@ -8,9 +8,9 @@ import ( "fmt" hclog "github.com/hashicorp/go-hclog" - "github.com/hashicorp/nomad/client/allocrunner/cni" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/plugins/drivers" + "github.com/hashicorp/nomad/v2/client/allocrunner/cni" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/plugins/drivers" ) const ( diff --git a/client/allocrunner/networking_bridge_linux_test.go b/client/allocrunner/networking_bridge_linux_test.go index 9bce40bd327..dd736cf9965 100644 --- a/client/allocrunner/networking_bridge_linux_test.go +++ b/client/allocrunner/networking_bridge_linux_test.go @@ -13,9 +13,9 @@ import ( "github.com/coreos/go-iptables/iptables" "github.com/hashicorp/go-hclog" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" "github.com/shoenig/test/must" ) diff --git a/client/allocrunner/networking_cni.go b/client/allocrunner/networking_cni.go index ad62ac287ed..a68d3d332b7 100644 --- a/client/allocrunner/networking_cni.go +++ b/client/allocrunner/networking_cni.go @@ -29,11 +29,11 @@ import ( log "github.com/hashicorp/go-hclog" "github.com/hashicorp/go-set/v3" "github.com/hashicorp/go-version" - "github.com/hashicorp/nomad/client/taskenv" - "github.com/hashicorp/nomad/helper" - "github.com/hashicorp/nomad/helper/envoy" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/plugins/drivers" + "github.com/hashicorp/nomad/v2/client/taskenv" + "github.com/hashicorp/nomad/v2/helper" + "github.com/hashicorp/nomad/v2/helper/envoy" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/plugins/drivers" ) const ( diff --git a/client/allocrunner/networking_cni_mock_test.go b/client/allocrunner/networking_cni_mock_test.go index 081f8967183..08f6d3ebbb2 100644 --- a/client/allocrunner/networking_cni_mock_test.go +++ b/client/allocrunner/networking_cni_mock_test.go @@ -10,7 +10,7 @@ import ( "github.com/containerd/go-cni" "github.com/containernetworking/cni/pkg/types" - "github.com/hashicorp/nomad/testutil" + "github.com/hashicorp/nomad/v2/testutil" ) var _ cni.CNI = &mockCNIPlugin{} diff --git a/client/allocrunner/networking_cni_test.go b/client/allocrunner/networking_cni_test.go index 5b1756a2c50..e0ed53199f6 100644 --- a/client/allocrunner/networking_cni_test.go +++ b/client/allocrunner/networking_cni_test.go @@ -17,11 +17,11 @@ import ( "github.com/containerd/go-cni" "github.com/containernetworking/cni/pkg/types" "github.com/hashicorp/consul/sdk/iptables" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/helper/testlog" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/plugins/drivers" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/helper/testlog" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/plugins/drivers" "github.com/shoenig/test" "github.com/shoenig/test/must" "github.com/stretchr/testify/require" diff --git a/client/allocrunner/networking_iptables.go b/client/allocrunner/networking_iptables.go index 740d1407554..358e8625e7b 100644 --- a/client/allocrunner/networking_iptables.go +++ b/client/allocrunner/networking_iptables.go @@ -9,7 +9,7 @@ import ( "fmt" "github.com/coreos/go-iptables/iptables" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/nomad/structs" ) const ( diff --git a/client/allocrunner/networking_iptables_test.go b/client/allocrunner/networking_iptables_test.go index 60386a11967..8509095b4f2 100644 --- a/client/allocrunner/networking_iptables_test.go +++ b/client/allocrunner/networking_iptables_test.go @@ -11,7 +11,7 @@ import ( "testing" "github.com/coreos/go-iptables/iptables" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/nomad/structs" "github.com/shoenig/test/must" ) diff --git a/client/allocrunner/state/state.go b/client/allocrunner/state/state.go index 3f6cf2154a4..a635bfac6e5 100644 --- a/client/allocrunner/state/state.go +++ b/client/allocrunner/state/state.go @@ -6,8 +6,8 @@ package state import ( "time" - "github.com/hashicorp/nomad/client/pluginmanager/csimanager" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/client/pluginmanager/csimanager" + "github.com/hashicorp/nomad/v2/nomad/structs" ) // State captures the state of the allocation runner. diff --git a/client/allocrunner/tasklifecycle/coordinator.go b/client/allocrunner/tasklifecycle/coordinator.go index c8c84f5c8d2..a2459ff21da 100644 --- a/client/allocrunner/tasklifecycle/coordinator.go +++ b/client/allocrunner/tasklifecycle/coordinator.go @@ -8,7 +8,7 @@ import ( "sync" "github.com/hashicorp/go-hclog" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/nomad/structs" ) // coordinatorState represents a state of the task lifecycle Coordinator FSM. diff --git a/client/allocrunner/tasklifecycle/coordinator_test.go b/client/allocrunner/tasklifecycle/coordinator_test.go index 31dc7b5ca3c..183d766c80d 100644 --- a/client/allocrunner/tasklifecycle/coordinator_test.go +++ b/client/allocrunner/tasklifecycle/coordinator_test.go @@ -7,10 +7,10 @@ import ( "testing" "time" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/helper/testlog" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/helper/testlog" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" ) func TestCoordinator_OnlyMainApp(t *testing.T) { diff --git a/client/allocrunner/tasklifecycle/gate_test.go b/client/allocrunner/tasklifecycle/gate_test.go index ff904db90ce..ad82b16ea58 100644 --- a/client/allocrunner/tasklifecycle/gate_test.go +++ b/client/allocrunner/tasklifecycle/gate_test.go @@ -7,8 +7,8 @@ import ( "testing" "time" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/helper" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/helper" ) func TestGate(t *testing.T) { diff --git a/client/allocrunner/tasklifecycle/testing.go b/client/allocrunner/tasklifecycle/testing.go index a0f7d79053a..fe620b5238c 100644 --- a/client/allocrunner/tasklifecycle/testing.go +++ b/client/allocrunner/tasklifecycle/testing.go @@ -7,8 +7,8 @@ import ( "testing" "time" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/testutil" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/testutil" ) func RequireTaskBlocked(t testing.TB, c *Coordinator, task *structs.Task) { diff --git a/client/allocrunner/taskrunner/api_hook.go b/client/allocrunner/taskrunner/api_hook.go index 98f9319bac1..e8e90f42429 100644 --- a/client/allocrunner/taskrunner/api_hook.go +++ b/client/allocrunner/taskrunner/api_hook.go @@ -13,10 +13,10 @@ import ( "sync" "github.com/hashicorp/go-hclog" - "github.com/hashicorp/nomad/client/allocdir" - "github.com/hashicorp/nomad/client/allocrunner/interfaces" - "github.com/hashicorp/nomad/client/config" - "github.com/hashicorp/nomad/helper/users" + "github.com/hashicorp/nomad/v2/client/allocdir" + "github.com/hashicorp/nomad/v2/client/allocrunner/interfaces" + "github.com/hashicorp/nomad/v2/client/config" + "github.com/hashicorp/nomad/v2/helper/users" ) // apiHook exposes the Task API. The Task API allows task's to access the Nomad diff --git a/client/allocrunner/taskrunner/api_hook_test.go b/client/allocrunner/taskrunner/api_hook_test.go index 11ffe4cd498..442d7c4cb0d 100644 --- a/client/allocrunner/taskrunner/api_hook_test.go +++ b/client/allocrunner/taskrunner/api_hook_test.go @@ -15,12 +15,12 @@ import ( "syscall" "testing" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/client/allocdir" - "github.com/hashicorp/nomad/client/allocrunner/interfaces" - "github.com/hashicorp/nomad/helper/testlog" - "github.com/hashicorp/nomad/helper/users" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/client/allocdir" + "github.com/hashicorp/nomad/v2/client/allocrunner/interfaces" + "github.com/hashicorp/nomad/v2/helper/testlog" + "github.com/hashicorp/nomad/v2/helper/users" + "github.com/hashicorp/nomad/v2/nomad/structs" "github.com/shoenig/test/must" ) diff --git a/client/allocrunner/taskrunner/artifact_hook.go b/client/allocrunner/taskrunner/artifact_hook.go index d000fd1c68d..600cdbabb7a 100644 --- a/client/allocrunner/taskrunner/artifact_hook.go +++ b/client/allocrunner/taskrunner/artifact_hook.go @@ -9,11 +9,11 @@ import ( "sync" log "github.com/hashicorp/go-hclog" - "github.com/hashicorp/nomad/client/allocrunner/interfaces" - te "github.com/hashicorp/nomad/client/allocrunner/taskrunner/errors" - ti "github.com/hashicorp/nomad/client/allocrunner/taskrunner/interfaces" - ci "github.com/hashicorp/nomad/client/interfaces" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/client/allocrunner/interfaces" + te "github.com/hashicorp/nomad/v2/client/allocrunner/taskrunner/errors" + ti "github.com/hashicorp/nomad/v2/client/allocrunner/taskrunner/interfaces" + ci "github.com/hashicorp/nomad/v2/client/interfaces" + "github.com/hashicorp/nomad/v2/nomad/structs" ) // artifactHook downloads artifacts for a task. diff --git a/client/allocrunner/taskrunner/artifact_hook_test.go b/client/allocrunner/taskrunner/artifact_hook_test.go index ea36f8d3f39..0a83bf5f010 100644 --- a/client/allocrunner/taskrunner/artifact_hook_test.go +++ b/client/allocrunner/taskrunner/artifact_hook_test.go @@ -14,15 +14,15 @@ import ( "sort" "testing" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/client/allocdir" - "github.com/hashicorp/nomad/client/allocrunner/interfaces" - "github.com/hashicorp/nomad/client/allocrunner/taskrunner/getter" - trtesting "github.com/hashicorp/nomad/client/allocrunner/taskrunner/testing" - "github.com/hashicorp/nomad/client/taskenv" - "github.com/hashicorp/nomad/client/testutil" - "github.com/hashicorp/nomad/helper/testlog" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/client/allocdir" + "github.com/hashicorp/nomad/v2/client/allocrunner/interfaces" + "github.com/hashicorp/nomad/v2/client/allocrunner/taskrunner/getter" + trtesting "github.com/hashicorp/nomad/v2/client/allocrunner/taskrunner/testing" + "github.com/hashicorp/nomad/v2/client/taskenv" + "github.com/hashicorp/nomad/v2/client/testutil" + "github.com/hashicorp/nomad/v2/helper/testlog" + "github.com/hashicorp/nomad/v2/nomad/structs" "github.com/stretchr/testify/require" ) diff --git a/client/allocrunner/taskrunner/connect_native_hook.go b/client/allocrunner/taskrunner/connect_native_hook.go index e45d6f9ee00..c0949cf6934 100644 --- a/client/allocrunner/taskrunner/connect_native_hook.go +++ b/client/allocrunner/taskrunner/connect_native_hook.go @@ -11,10 +11,10 @@ import ( "path/filepath" "github.com/hashicorp/go-hclog" - "github.com/hashicorp/nomad/client/allocdir" - ifs "github.com/hashicorp/nomad/client/allocrunner/interfaces" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/nomad/structs/config" + "github.com/hashicorp/nomad/v2/client/allocdir" + ifs "github.com/hashicorp/nomad/v2/client/allocrunner/interfaces" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/nomad/structs/config" ) const ( diff --git a/client/allocrunner/taskrunner/connect_native_hook_test.go b/client/allocrunner/taskrunner/connect_native_hook_test.go index ab31086dd89..ce43359824c 100644 --- a/client/allocrunner/taskrunner/connect_native_hook_test.go +++ b/client/allocrunner/taskrunner/connect_native_hook_test.go @@ -12,18 +12,18 @@ import ( consulapi "github.com/hashicorp/consul/api" consultest "github.com/hashicorp/consul/sdk/testutil" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/client/allocdir" - "github.com/hashicorp/nomad/client/allocrunner/interfaces" - "github.com/hashicorp/nomad/client/taskenv" - "github.com/hashicorp/nomad/client/testutil" - agentconsul "github.com/hashicorp/nomad/command/agent/consul" - "github.com/hashicorp/nomad/helper/testlog" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/nomad/structs/config" - "github.com/hashicorp/nomad/plugins/drivers/fsisolation" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/client/allocdir" + "github.com/hashicorp/nomad/v2/client/allocrunner/interfaces" + "github.com/hashicorp/nomad/v2/client/taskenv" + "github.com/hashicorp/nomad/v2/client/testutil" + agentconsul "github.com/hashicorp/nomad/v2/command/agent/consul" + "github.com/hashicorp/nomad/v2/helper/testlog" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/nomad/structs/config" + "github.com/hashicorp/nomad/v2/plugins/drivers/fsisolation" "github.com/stretchr/testify/require" ) diff --git a/client/allocrunner/taskrunner/consul_hook.go b/client/allocrunner/taskrunner/consul_hook.go index 5c74159358c..9a8344170ef 100644 --- a/client/allocrunner/taskrunner/consul_hook.go +++ b/client/allocrunner/taskrunner/consul_hook.go @@ -13,9 +13,9 @@ import ( log "github.com/hashicorp/go-hclog" "github.com/hashicorp/go-multierror" - "github.com/hashicorp/nomad/client/allocrunner/interfaces" - cstructs "github.com/hashicorp/nomad/client/structs" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/client/allocrunner/interfaces" + cstructs "github.com/hashicorp/nomad/v2/client/structs" + "github.com/hashicorp/nomad/v2/nomad/structs" ) const ( diff --git a/client/allocrunner/taskrunner/consul_hook_test.go b/client/allocrunner/taskrunner/consul_hook_test.go index 73c03f4a061..8e85da9f0e3 100644 --- a/client/allocrunner/taskrunner/consul_hook_test.go +++ b/client/allocrunner/taskrunner/consul_hook_test.go @@ -9,11 +9,11 @@ import ( "testing" "github.com/hashicorp/consul/api" - "github.com/hashicorp/nomad/client/allocrunner/interfaces" - cstructs "github.com/hashicorp/nomad/client/structs" - "github.com/hashicorp/nomad/helper/testlog" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/client/allocrunner/interfaces" + cstructs "github.com/hashicorp/nomad/v2/client/structs" + "github.com/hashicorp/nomad/v2/helper/testlog" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" "github.com/shoenig/test/must" ) diff --git a/client/allocrunner/taskrunner/device_hook.go b/client/allocrunner/taskrunner/device_hook.go index e7a80a50f4d..0bc8b8a69be 100644 --- a/client/allocrunner/taskrunner/device_hook.go +++ b/client/allocrunner/taskrunner/device_hook.go @@ -8,10 +8,10 @@ import ( "fmt" log "github.com/hashicorp/go-hclog" - "github.com/hashicorp/nomad/client/allocrunner/interfaces" - "github.com/hashicorp/nomad/client/devicemanager" - "github.com/hashicorp/nomad/plugins/device" - "github.com/hashicorp/nomad/plugins/drivers" + "github.com/hashicorp/nomad/v2/client/allocrunner/interfaces" + "github.com/hashicorp/nomad/v2/client/devicemanager" + "github.com/hashicorp/nomad/v2/plugins/device" + "github.com/hashicorp/nomad/v2/plugins/drivers" ) const ( diff --git a/client/allocrunner/taskrunner/device_hook_test.go b/client/allocrunner/taskrunner/device_hook_test.go index 81ea9ab2939..87f37003ba2 100644 --- a/client/allocrunner/taskrunner/device_hook_test.go +++ b/client/allocrunner/taskrunner/device_hook_test.go @@ -8,13 +8,13 @@ import ( "fmt" "testing" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/client/allocrunner/interfaces" - "github.com/hashicorp/nomad/client/devicemanager" - "github.com/hashicorp/nomad/helper/testlog" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/plugins/device" - "github.com/hashicorp/nomad/plugins/drivers" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/client/allocrunner/interfaces" + "github.com/hashicorp/nomad/v2/client/devicemanager" + "github.com/hashicorp/nomad/v2/helper/testlog" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/plugins/device" + "github.com/hashicorp/nomad/v2/plugins/drivers" "github.com/stretchr/testify/require" ) diff --git a/client/allocrunner/taskrunner/dispatch_hook.go b/client/allocrunner/taskrunner/dispatch_hook.go index c2ad8c37643..324fb5e9497 100644 --- a/client/allocrunner/taskrunner/dispatch_hook.go +++ b/client/allocrunner/taskrunner/dispatch_hook.go @@ -10,8 +10,8 @@ import ( "github.com/golang/snappy" hclog "github.com/hashicorp/go-hclog" - "github.com/hashicorp/nomad/client/allocrunner/interfaces" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/client/allocrunner/interfaces" + "github.com/hashicorp/nomad/v2/nomad/structs" ) // dispatchHook writes a dispatch payload to the task dir diff --git a/client/allocrunner/taskrunner/dispatch_hook_test.go b/client/allocrunner/taskrunner/dispatch_hook_test.go index f2e43d61abf..3ba78e855ae 100644 --- a/client/allocrunner/taskrunner/dispatch_hook_test.go +++ b/client/allocrunner/taskrunner/dispatch_hook_test.go @@ -10,13 +10,13 @@ import ( "testing" "github.com/golang/snappy" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/client/allocdir" - "github.com/hashicorp/nomad/client/allocrunner/interfaces" - "github.com/hashicorp/nomad/helper/testlog" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/plugins/drivers/fsisolation" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/client/allocdir" + "github.com/hashicorp/nomad/v2/client/allocrunner/interfaces" + "github.com/hashicorp/nomad/v2/helper/testlog" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/plugins/drivers/fsisolation" "github.com/stretchr/testify/require" ) diff --git a/client/allocrunner/taskrunner/driver_handle.go b/client/allocrunner/taskrunner/driver_handle.go index 544d814ab72..444b39f3545 100644 --- a/client/allocrunner/taskrunner/driver_handle.go +++ b/client/allocrunner/taskrunner/driver_handle.go @@ -8,10 +8,10 @@ import ( "fmt" "time" - te "github.com/hashicorp/nomad/client/allocrunner/taskrunner/errors" - cstructs "github.com/hashicorp/nomad/client/structs" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/plugins/drivers" + te "github.com/hashicorp/nomad/v2/client/allocrunner/taskrunner/errors" + cstructs "github.com/hashicorp/nomad/v2/client/structs" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/plugins/drivers" ) // NewDriverHandle returns a handle for task operations on a specific task diff --git a/client/allocrunner/taskrunner/dynamic_users_hook.go b/client/allocrunner/taskrunner/dynamic_users_hook.go index f9cfc885d4b..3136b351bb5 100644 --- a/client/allocrunner/taskrunner/dynamic_users_hook.go +++ b/client/allocrunner/taskrunner/dynamic_users_hook.go @@ -9,8 +9,8 @@ import ( "sync" "github.com/hashicorp/go-hclog" - "github.com/hashicorp/nomad/client/allocrunner/interfaces" - "github.com/hashicorp/nomad/helper/users/dynamic" + "github.com/hashicorp/nomad/v2/client/allocrunner/interfaces" + "github.com/hashicorp/nomad/v2/helper/users/dynamic" ) const ( diff --git a/client/allocrunner/taskrunner/dynamic_users_hook_test.go b/client/allocrunner/taskrunner/dynamic_users_hook_test.go index e0b38ec5e92..4936c6a0d84 100644 --- a/client/allocrunner/taskrunner/dynamic_users_hook_test.go +++ b/client/allocrunner/taskrunner/dynamic_users_hook_test.go @@ -7,11 +7,11 @@ import ( "context" "testing" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/client/allocrunner/interfaces" - "github.com/hashicorp/nomad/helper/testlog" - "github.com/hashicorp/nomad/helper/users/dynamic" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/client/allocrunner/interfaces" + "github.com/hashicorp/nomad/v2/helper/testlog" + "github.com/hashicorp/nomad/v2/helper/users/dynamic" + "github.com/hashicorp/nomad/v2/nomad/structs" "github.com/shoenig/test/must" ) diff --git a/client/allocrunner/taskrunner/envoy_bootstrap_hook.go b/client/allocrunner/taskrunner/envoy_bootstrap_hook.go index ffafe92eada..96ecd302b90 100644 --- a/client/allocrunner/taskrunner/envoy_bootstrap_hook.go +++ b/client/allocrunner/taskrunner/envoy_bootstrap_hook.go @@ -18,13 +18,13 @@ import ( "time" "github.com/hashicorp/go-hclog" - "github.com/hashicorp/nomad/client/allocdir" - ifs "github.com/hashicorp/nomad/client/allocrunner/interfaces" - "github.com/hashicorp/nomad/client/serviceregistration" - "github.com/hashicorp/nomad/client/taskenv" - "github.com/hashicorp/nomad/helper" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/nomad/structs/config" + "github.com/hashicorp/nomad/v2/client/allocdir" + ifs "github.com/hashicorp/nomad/v2/client/allocrunner/interfaces" + "github.com/hashicorp/nomad/v2/client/serviceregistration" + "github.com/hashicorp/nomad/v2/client/taskenv" + "github.com/hashicorp/nomad/v2/helper" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/nomad/structs/config" "oss.indeed.com/go/libtime" "oss.indeed.com/go/libtime/decay" ) diff --git a/client/allocrunner/taskrunner/envoy_bootstrap_hook_test.go b/client/allocrunner/taskrunner/envoy_bootstrap_hook_test.go index f9361bf1fca..84f94d24dbb 100644 --- a/client/allocrunner/taskrunner/envoy_bootstrap_hook_test.go +++ b/client/allocrunner/taskrunner/envoy_bootstrap_hook_test.go @@ -20,20 +20,20 @@ import ( "time" consulapi "github.com/hashicorp/consul/api" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/client/allocdir" - "github.com/hashicorp/nomad/client/allocrunner/interfaces" - "github.com/hashicorp/nomad/client/serviceregistration" - "github.com/hashicorp/nomad/client/taskenv" - "github.com/hashicorp/nomad/client/testutil" - agentconsul "github.com/hashicorp/nomad/command/agent/consul" - "github.com/hashicorp/nomad/helper/args" - "github.com/hashicorp/nomad/helper/testlog" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/nomad/structs/config" - "github.com/hashicorp/nomad/plugins/drivers/fsisolation" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/client/allocdir" + "github.com/hashicorp/nomad/v2/client/allocrunner/interfaces" + "github.com/hashicorp/nomad/v2/client/serviceregistration" + "github.com/hashicorp/nomad/v2/client/taskenv" + "github.com/hashicorp/nomad/v2/client/testutil" + agentconsul "github.com/hashicorp/nomad/v2/command/agent/consul" + "github.com/hashicorp/nomad/v2/helper/args" + "github.com/hashicorp/nomad/v2/helper/testlog" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/nomad/structs/config" + "github.com/hashicorp/nomad/v2/plugins/drivers/fsisolation" "github.com/shoenig/test/must" "github.com/stretchr/testify/require" "golang.org/x/sys/unix" diff --git a/client/allocrunner/taskrunner/envoy_version_hook.go b/client/allocrunner/taskrunner/envoy_version_hook.go index 52e12ced15b..8277e40e4c2 100644 --- a/client/allocrunner/taskrunner/envoy_version_hook.go +++ b/client/allocrunner/taskrunner/envoy_version_hook.go @@ -11,11 +11,11 @@ import ( "github.com/hashicorp/go-hclog" "github.com/hashicorp/go-version" - ifs "github.com/hashicorp/nomad/client/allocrunner/interfaces" - "github.com/hashicorp/nomad/client/consul" - "github.com/hashicorp/nomad/client/taskenv" - "github.com/hashicorp/nomad/helper/envoy" - "github.com/hashicorp/nomad/nomad/structs" + ifs "github.com/hashicorp/nomad/v2/client/allocrunner/interfaces" + "github.com/hashicorp/nomad/v2/client/consul" + "github.com/hashicorp/nomad/v2/client/taskenv" + "github.com/hashicorp/nomad/v2/helper/envoy" + "github.com/hashicorp/nomad/v2/nomad/structs" ) const ( diff --git a/client/allocrunner/taskrunner/envoy_version_hook_test.go b/client/allocrunner/taskrunner/envoy_version_hook_test.go index 8f83db93ac3..6373cb6dac4 100644 --- a/client/allocrunner/taskrunner/envoy_version_hook_test.go +++ b/client/allocrunner/taskrunner/envoy_version_hook_test.go @@ -8,17 +8,17 @@ import ( "errors" "testing" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/client/allocdir" - ifs "github.com/hashicorp/nomad/client/allocrunner/interfaces" - clientconsul "github.com/hashicorp/nomad/client/consul" - "github.com/hashicorp/nomad/client/taskenv" - "github.com/hashicorp/nomad/command/agent/consul" - "github.com/hashicorp/nomad/helper/envoy" - "github.com/hashicorp/nomad/helper/testlog" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/plugins/drivers/fsisolation" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/client/allocdir" + ifs "github.com/hashicorp/nomad/v2/client/allocrunner/interfaces" + clientconsul "github.com/hashicorp/nomad/v2/client/consul" + "github.com/hashicorp/nomad/v2/client/taskenv" + "github.com/hashicorp/nomad/v2/command/agent/consul" + "github.com/hashicorp/nomad/v2/helper/envoy" + "github.com/hashicorp/nomad/v2/helper/testlog" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/plugins/drivers/fsisolation" "github.com/shoenig/test/must" ) diff --git a/client/allocrunner/taskrunner/errors/errors.go b/client/allocrunner/taskrunner/errors/errors.go index 0f3d90d8361..f7471660139 100644 --- a/client/allocrunner/taskrunner/errors/errors.go +++ b/client/allocrunner/taskrunner/errors/errors.go @@ -6,7 +6,7 @@ package errors import ( "errors" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/nomad/structs" ) // ErrTaskNotRunning is returned when the underlying task is not currently diff --git a/client/allocrunner/taskrunner/errors/errors_test.go b/client/allocrunner/taskrunner/errors/errors_test.go index f475e22f675..7101902e0de 100644 --- a/client/allocrunner/taskrunner/errors/errors_test.go +++ b/client/allocrunner/taskrunner/errors/errors_test.go @@ -7,8 +7,8 @@ import ( "errors" "testing" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/nomad/structs" "github.com/shoenig/test/must" ) diff --git a/client/allocrunner/taskrunner/getter/error_test.go b/client/allocrunner/taskrunner/getter/error_test.go index 5bb7cef18d9..be038c08d89 100644 --- a/client/allocrunner/taskrunner/getter/error_test.go +++ b/client/allocrunner/taskrunner/getter/error_test.go @@ -7,7 +7,7 @@ import ( "errors" "testing" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/nomad/structs" "github.com/shoenig/test/must" ) diff --git a/client/allocrunner/taskrunner/getter/params.go b/client/allocrunner/taskrunner/getter/params.go index 1372193c536..ebfd4afd768 100644 --- a/client/allocrunner/taskrunner/getter/params.go +++ b/client/allocrunner/taskrunner/getter/params.go @@ -14,7 +14,7 @@ import ( "time" "github.com/hashicorp/go-getter" - "github.com/hashicorp/nomad/helper" + "github.com/hashicorp/nomad/v2/helper" ) // parameters is encoded by the Nomad client and decoded by the getter sub-process diff --git a/client/allocrunner/taskrunner/getter/replacer_test.go b/client/allocrunner/taskrunner/getter/replacer_test.go index c05909c862b..e7489a4f48b 100644 --- a/client/allocrunner/taskrunner/getter/replacer_test.go +++ b/client/allocrunner/taskrunner/getter/replacer_test.go @@ -7,8 +7,8 @@ import ( "path/filepath" "strings" - "github.com/hashicorp/nomad/client/interfaces" - "github.com/hashicorp/nomad/helper/escapingfs" + "github.com/hashicorp/nomad/v2/client/interfaces" + "github.com/hashicorp/nomad/v2/helper/escapingfs" ) // noopReplacer is a noop version of taskenv.TaskEnv.ReplaceEnv. diff --git a/client/allocrunner/taskrunner/getter/sandbox.go b/client/allocrunner/taskrunner/getter/sandbox.go index 5959b208560..e4892bc14bf 100644 --- a/client/allocrunner/taskrunner/getter/sandbox.go +++ b/client/allocrunner/taskrunner/getter/sandbox.go @@ -5,9 +5,9 @@ package getter import ( "github.com/hashicorp/go-hclog" - "github.com/hashicorp/nomad/client/config" - "github.com/hashicorp/nomad/client/interfaces" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/client/config" + "github.com/hashicorp/nomad/v2/client/interfaces" + "github.com/hashicorp/nomad/v2/nomad/structs" ) // New creates a Sandbox with the given ArtifactConfig. diff --git a/client/allocrunner/taskrunner/getter/sandbox_default_test.go b/client/allocrunner/taskrunner/getter/sandbox_default_test.go index 60bbdfd8313..cc5fe1edfd8 100644 --- a/client/allocrunner/taskrunner/getter/sandbox_default_test.go +++ b/client/allocrunner/taskrunner/getter/sandbox_default_test.go @@ -12,10 +12,10 @@ import ( "testing" "time" - "github.com/hashicorp/nomad/client/interfaces" - "github.com/hashicorp/nomad/client/testutil" - "github.com/hashicorp/nomad/helper/testlog" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/client/interfaces" + "github.com/hashicorp/nomad/v2/client/testutil" + "github.com/hashicorp/nomad/v2/helper/testlog" + "github.com/hashicorp/nomad/v2/nomad/structs" "github.com/shoenig/test/must" ) diff --git a/client/allocrunner/taskrunner/getter/sandbox_test.go b/client/allocrunner/taskrunner/getter/sandbox_test.go index 511aea9d5b3..50bbe109845 100644 --- a/client/allocrunner/taskrunner/getter/sandbox_test.go +++ b/client/allocrunner/taskrunner/getter/sandbox_test.go @@ -15,11 +15,11 @@ import ( "testing" "time" - "github.com/hashicorp/nomad/client/config" - "github.com/hashicorp/nomad/client/interfaces" - "github.com/hashicorp/nomad/client/testutil" - "github.com/hashicorp/nomad/helper/testlog" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/client/config" + "github.com/hashicorp/nomad/v2/client/interfaces" + "github.com/hashicorp/nomad/v2/client/testutil" + "github.com/hashicorp/nomad/v2/helper/testlog" + "github.com/hashicorp/nomad/v2/nomad/structs" "github.com/shoenig/test/must" ) diff --git a/client/allocrunner/taskrunner/getter/testing.go b/client/allocrunner/taskrunner/getter/testing.go index 3f7ed397976..0947d042eac 100644 --- a/client/allocrunner/taskrunner/getter/testing.go +++ b/client/allocrunner/taskrunner/getter/testing.go @@ -8,9 +8,9 @@ import ( "path/filepath" "testing" - cconfig "github.com/hashicorp/nomad/client/config" - "github.com/hashicorp/nomad/helper/testlog" - sconfig "github.com/hashicorp/nomad/nomad/structs/config" + cconfig "github.com/hashicorp/nomad/v2/client/config" + "github.com/hashicorp/nomad/v2/helper/testlog" + sconfig "github.com/hashicorp/nomad/v2/nomad/structs/config" "github.com/shoenig/test/must" ) diff --git a/client/allocrunner/taskrunner/getter/util.go b/client/allocrunner/taskrunner/getter/util.go index 4e85dc681c0..48da332ad18 100644 --- a/client/allocrunner/taskrunner/getter/util.go +++ b/client/allocrunner/taskrunner/getter/util.go @@ -19,10 +19,10 @@ import ( "unicode" "github.com/hashicorp/go-getter" - "github.com/hashicorp/nomad/client/interfaces" - "github.com/hashicorp/nomad/helper/subproc" - "github.com/hashicorp/nomad/helper/users" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/client/interfaces" + "github.com/hashicorp/nomad/v2/helper/subproc" + "github.com/hashicorp/nomad/v2/helper/users" + "github.com/hashicorp/nomad/v2/nomad/structs" ) const ( diff --git a/client/allocrunner/taskrunner/getter/util_test.go b/client/allocrunner/taskrunner/getter/util_test.go index 597769b8fc4..58aa7255124 100644 --- a/client/allocrunner/taskrunner/getter/util_test.go +++ b/client/allocrunner/taskrunner/getter/util_test.go @@ -12,9 +12,9 @@ import ( "testing" "github.com/hashicorp/go-getter" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/client/testutil" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/client/testutil" + "github.com/hashicorp/nomad/v2/nomad/structs" "github.com/mitchellh/go-homedir" "github.com/shoenig/test/must" ) diff --git a/client/allocrunner/taskrunner/getter/z_getter_cmd.go b/client/allocrunner/taskrunner/getter/z_getter_cmd.go index 995023b25ff..62ec98c5535 100644 --- a/client/allocrunner/taskrunner/getter/z_getter_cmd.go +++ b/client/allocrunner/taskrunner/getter/z_getter_cmd.go @@ -7,7 +7,7 @@ import ( "os" log "github.com/hashicorp/go-hclog" - "github.com/hashicorp/nomad/helper/subproc" + "github.com/hashicorp/nomad/v2/helper/subproc" ) const ( diff --git a/client/allocrunner/taskrunner/identity_hook.go b/client/allocrunner/taskrunner/identity_hook.go index 44c1ccec421..85ae153fef1 100644 --- a/client/allocrunner/taskrunner/identity_hook.go +++ b/client/allocrunner/taskrunner/identity_hook.go @@ -12,13 +12,13 @@ import ( "github.com/hashicorp/consul-template/signals" log "github.com/hashicorp/go-hclog" - "github.com/hashicorp/nomad/client/allocdir" - "github.com/hashicorp/nomad/client/allocrunner/interfaces" - ti "github.com/hashicorp/nomad/client/allocrunner/taskrunner/interfaces" - "github.com/hashicorp/nomad/client/taskenv" - "github.com/hashicorp/nomad/client/widmgr" - "github.com/hashicorp/nomad/helper/users" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/client/allocdir" + "github.com/hashicorp/nomad/v2/client/allocrunner/interfaces" + ti "github.com/hashicorp/nomad/v2/client/allocrunner/taskrunner/interfaces" + "github.com/hashicorp/nomad/v2/client/taskenv" + "github.com/hashicorp/nomad/v2/client/widmgr" + "github.com/hashicorp/nomad/v2/helper/users" + "github.com/hashicorp/nomad/v2/nomad/structs" ) // identityHook sets the task runner's Nomad workload identity token diff --git a/client/allocrunner/taskrunner/identity_hook_test.go b/client/allocrunner/taskrunner/identity_hook_test.go index 754a65316f5..07c9d42c608 100644 --- a/client/allocrunner/taskrunner/identity_hook_test.go +++ b/client/allocrunner/taskrunner/identity_hook_test.go @@ -9,17 +9,17 @@ import ( "testing" "time" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/client/allocdir" - "github.com/hashicorp/nomad/client/allocrunner/interfaces" - trtesting "github.com/hashicorp/nomad/client/allocrunner/taskrunner/testing" - cstate "github.com/hashicorp/nomad/client/state" - "github.com/hashicorp/nomad/client/taskenv" - "github.com/hashicorp/nomad/client/widmgr" - "github.com/hashicorp/nomad/helper/testlog" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/testutil" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/client/allocdir" + "github.com/hashicorp/nomad/v2/client/allocrunner/interfaces" + trtesting "github.com/hashicorp/nomad/v2/client/allocrunner/taskrunner/testing" + cstate "github.com/hashicorp/nomad/v2/client/state" + "github.com/hashicorp/nomad/v2/client/taskenv" + "github.com/hashicorp/nomad/v2/client/widmgr" + "github.com/hashicorp/nomad/v2/helper/testlog" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/testutil" "github.com/shoenig/test/must" ) diff --git a/client/allocrunner/taskrunner/interfaces/events.go b/client/allocrunner/taskrunner/interfaces/events.go index 6f6ab5f0e68..92d8c66eea5 100644 --- a/client/allocrunner/taskrunner/interfaces/events.go +++ b/client/allocrunner/taskrunner/interfaces/events.go @@ -3,7 +3,7 @@ package interfaces -import "github.com/hashicorp/nomad/nomad/structs" +import "github.com/hashicorp/nomad/v2/nomad/structs" type EventEmitter interface { EmitEvent(event *structs.TaskEvent) diff --git a/client/allocrunner/taskrunner/interfaces/lifecycle.go b/client/allocrunner/taskrunner/interfaces/lifecycle.go index 451e77b457e..7ea042edf6e 100644 --- a/client/allocrunner/taskrunner/interfaces/lifecycle.go +++ b/client/allocrunner/taskrunner/interfaces/lifecycle.go @@ -7,7 +7,7 @@ import ( "context" "time" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/nomad/structs" ) type TaskLifecycle interface { diff --git a/client/allocrunner/taskrunner/lazy_handle.go b/client/allocrunner/taskrunner/lazy_handle.go index 95742a30f7a..2dfab97484f 100644 --- a/client/allocrunner/taskrunner/lazy_handle.go +++ b/client/allocrunner/taskrunner/lazy_handle.go @@ -10,8 +10,8 @@ import ( "time" log "github.com/hashicorp/go-hclog" - cstructs "github.com/hashicorp/nomad/client/structs" - bstructs "github.com/hashicorp/nomad/plugins/base/structs" + cstructs "github.com/hashicorp/nomad/v2/client/structs" + bstructs "github.com/hashicorp/nomad/v2/plugins/base/structs" ) const ( diff --git a/client/allocrunner/taskrunner/lifecycle.go b/client/allocrunner/taskrunner/lifecycle.go index 744effd8492..499ab03bb1d 100644 --- a/client/allocrunner/taskrunner/lifecycle.go +++ b/client/allocrunner/taskrunner/lifecycle.go @@ -7,8 +7,8 @@ import ( "context" "time" - te "github.com/hashicorp/nomad/client/allocrunner/taskrunner/errors" - "github.com/hashicorp/nomad/nomad/structs" + te "github.com/hashicorp/nomad/v2/client/allocrunner/taskrunner/errors" + "github.com/hashicorp/nomad/v2/nomad/structs" ) // Restart restarts a task that is already running. Returns an error if the diff --git a/client/allocrunner/taskrunner/logmon_hook.go b/client/allocrunner/taskrunner/logmon_hook.go index 2dca03c292b..51778b4b49f 100644 --- a/client/allocrunner/taskrunner/logmon_hook.go +++ b/client/allocrunner/taskrunner/logmon_hook.go @@ -14,12 +14,12 @@ import ( hclog "github.com/hashicorp/go-hclog" plugin "github.com/hashicorp/go-plugin" - "github.com/hashicorp/nomad/client/allocrunner/interfaces" - "github.com/hashicorp/nomad/client/logmon" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/nomad/structs" - bstructs "github.com/hashicorp/nomad/plugins/base/structs" - pstructs "github.com/hashicorp/nomad/plugins/shared/structs" + "github.com/hashicorp/nomad/v2/client/allocrunner/interfaces" + "github.com/hashicorp/nomad/v2/client/logmon" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/nomad/structs" + bstructs "github.com/hashicorp/nomad/v2/plugins/base/structs" + pstructs "github.com/hashicorp/nomad/v2/plugins/shared/structs" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/client/allocrunner/taskrunner/logmon_hook_test.go b/client/allocrunner/taskrunner/logmon_hook_test.go index 8bb733da522..499695bc7f3 100644 --- a/client/allocrunner/taskrunner/logmon_hook_test.go +++ b/client/allocrunner/taskrunner/logmon_hook_test.go @@ -11,11 +11,11 @@ import ( "testing" plugin "github.com/hashicorp/go-plugin" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/client/allocrunner/interfaces" - "github.com/hashicorp/nomad/helper/testlog" - "github.com/hashicorp/nomad/nomad/mock" - pstructs "github.com/hashicorp/nomad/plugins/shared/structs" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/client/allocrunner/interfaces" + "github.com/hashicorp/nomad/v2/helper/testlog" + "github.com/hashicorp/nomad/v2/nomad/mock" + pstructs "github.com/hashicorp/nomad/v2/plugins/shared/structs" "github.com/shoenig/test/must" "github.com/stretchr/testify/require" ) diff --git a/client/allocrunner/taskrunner/logmon_hook_unix_test.go b/client/allocrunner/taskrunner/logmon_hook_unix_test.go index 69801aa416d..a21a864cbd2 100644 --- a/client/allocrunner/taskrunner/logmon_hook_unix_test.go +++ b/client/allocrunner/taskrunner/logmon_hook_unix_test.go @@ -15,11 +15,11 @@ import ( "testing" "time" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/client/allocrunner/interfaces" - "github.com/hashicorp/nomad/helper/testlog" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/testutil" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/client/allocrunner/interfaces" + "github.com/hashicorp/nomad/v2/helper/testlog" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/testutil" "github.com/shirou/gopsutil/v3/process" "github.com/stretchr/testify/require" ) diff --git a/client/allocrunner/taskrunner/plugin_supervisor_hook.go b/client/allocrunner/taskrunner/plugin_supervisor_hook.go index acd25b6f7b0..645b8d846a5 100644 --- a/client/allocrunner/taskrunner/plugin_supervisor_hook.go +++ b/client/allocrunner/taskrunner/plugin_supervisor_hook.go @@ -13,12 +13,12 @@ import ( "github.com/LK4D4/joincontext" hclog "github.com/hashicorp/go-hclog" - "github.com/hashicorp/nomad/client/allocrunner/interfaces" - ti "github.com/hashicorp/nomad/client/allocrunner/taskrunner/interfaces" - "github.com/hashicorp/nomad/client/dynamicplugins" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/plugins/csi" - "github.com/hashicorp/nomad/plugins/drivers" + "github.com/hashicorp/nomad/v2/client/allocrunner/interfaces" + ti "github.com/hashicorp/nomad/v2/client/allocrunner/taskrunner/interfaces" + "github.com/hashicorp/nomad/v2/client/dynamicplugins" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/plugins/csi" + "github.com/hashicorp/nomad/v2/plugins/drivers" ) // csiPluginSupervisorHook manages supervising plugins that are running as Nomad diff --git a/client/allocrunner/taskrunner/restarts/restarts.go b/client/allocrunner/taskrunner/restarts/restarts.go index a3b71ffb601..213178747cf 100644 --- a/client/allocrunner/taskrunner/restarts/restarts.go +++ b/client/allocrunner/taskrunner/restarts/restarts.go @@ -9,8 +9,8 @@ import ( "sync" "time" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/plugins/drivers" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/plugins/drivers" ) const ( diff --git a/client/allocrunner/taskrunner/restarts/restarts_test.go b/client/allocrunner/taskrunner/restarts/restarts_test.go index 6b64a6d2e96..8e03d64272a 100644 --- a/client/allocrunner/taskrunner/restarts/restarts_test.go +++ b/client/allocrunner/taskrunner/restarts/restarts_test.go @@ -8,9 +8,9 @@ import ( "testing" "time" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/plugins/drivers" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/plugins/drivers" "github.com/stretchr/testify/require" ) diff --git a/client/allocrunner/taskrunner/sched_hook_ce.go b/client/allocrunner/taskrunner/sched_hook_ce.go index f2769fedf6c..31a1adf82a0 100644 --- a/client/allocrunner/taskrunner/sched_hook_ce.go +++ b/client/allocrunner/taskrunner/sched_hook_ce.go @@ -8,7 +8,7 @@ package taskrunner import ( "fmt" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/nomad/structs" ) type pauseHook struct{} diff --git a/client/allocrunner/taskrunner/script_check_hook.go b/client/allocrunner/taskrunner/script_check_hook.go index 658e95cfa12..aa9065f0bcf 100644 --- a/client/allocrunner/taskrunner/script_check_hook.go +++ b/client/allocrunner/taskrunner/script_check_hook.go @@ -11,13 +11,13 @@ import ( "github.com/hashicorp/consul/api" log "github.com/hashicorp/go-hclog" - "github.com/hashicorp/nomad/client/allocrunner/interfaces" - tinterfaces "github.com/hashicorp/nomad/client/allocrunner/taskrunner/interfaces" - "github.com/hashicorp/nomad/client/serviceregistration" - cstructs "github.com/hashicorp/nomad/client/structs" - "github.com/hashicorp/nomad/client/taskenv" - agentconsul "github.com/hashicorp/nomad/command/agent/consul" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/client/allocrunner/interfaces" + tinterfaces "github.com/hashicorp/nomad/v2/client/allocrunner/taskrunner/interfaces" + "github.com/hashicorp/nomad/v2/client/serviceregistration" + cstructs "github.com/hashicorp/nomad/v2/client/structs" + "github.com/hashicorp/nomad/v2/client/taskenv" + agentconsul "github.com/hashicorp/nomad/v2/command/agent/consul" + "github.com/hashicorp/nomad/v2/nomad/structs" ) var _ interfaces.TaskPoststartHook = &scriptCheckHook{} diff --git a/client/allocrunner/taskrunner/script_check_hook_test.go b/client/allocrunner/taskrunner/script_check_hook_test.go index 1896cb4e21f..1662f8481e1 100644 --- a/client/allocrunner/taskrunner/script_check_hook_test.go +++ b/client/allocrunner/taskrunner/script_check_hook_test.go @@ -12,17 +12,17 @@ import ( "github.com/hashicorp/consul/api" "github.com/hashicorp/go-hclog" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/client/allocrunner/taskrunner/interfaces" - "github.com/hashicorp/nomad/client/serviceregistration" - regMock "github.com/hashicorp/nomad/client/serviceregistration/mock" - "github.com/hashicorp/nomad/client/serviceregistration/wrapper" - cstructs "github.com/hashicorp/nomad/client/structs" - "github.com/hashicorp/nomad/client/taskenv" - agentconsul "github.com/hashicorp/nomad/command/agent/consul" - "github.com/hashicorp/nomad/helper/testlog" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/client/allocrunner/taskrunner/interfaces" + "github.com/hashicorp/nomad/v2/client/serviceregistration" + regMock "github.com/hashicorp/nomad/v2/client/serviceregistration/mock" + "github.com/hashicorp/nomad/v2/client/serviceregistration/wrapper" + cstructs "github.com/hashicorp/nomad/v2/client/structs" + "github.com/hashicorp/nomad/v2/client/taskenv" + agentconsul "github.com/hashicorp/nomad/v2/command/agent/consul" + "github.com/hashicorp/nomad/v2/helper/testlog" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" "github.com/shoenig/test/must" "github.com/stretchr/testify/require" ) diff --git a/client/allocrunner/taskrunner/secrets/nomad_provider.go b/client/allocrunner/taskrunner/secrets/nomad_provider.go index 2df8497829a..e3997765dd0 100644 --- a/client/allocrunner/taskrunner/secrets/nomad_provider.go +++ b/client/allocrunner/taskrunner/secrets/nomad_provider.go @@ -10,7 +10,7 @@ import ( "strings" "github.com/go-viper/mapstructure/v2" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/nomad/structs" ) const SecretProviderNomad = "nomad" diff --git a/client/allocrunner/taskrunner/secrets/nomad_provider_test.go b/client/allocrunner/taskrunner/secrets/nomad_provider_test.go index 481226d32e8..63432c0cbaa 100644 --- a/client/allocrunner/taskrunner/secrets/nomad_provider_test.go +++ b/client/allocrunner/taskrunner/secrets/nomad_provider_test.go @@ -6,7 +6,7 @@ package secrets import ( "testing" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/nomad/structs" "github.com/shoenig/test/must" ) diff --git a/client/allocrunner/taskrunner/secrets/plugin_provider.go b/client/allocrunner/taskrunner/secrets/plugin_provider.go index 0dded544782..7cf40781762 100644 --- a/client/allocrunner/taskrunner/secrets/plugin_provider.go +++ b/client/allocrunner/taskrunner/secrets/plugin_provider.go @@ -7,7 +7,7 @@ import ( "context" "fmt" - "github.com/hashicorp/nomad/client/commonplugins" + "github.com/hashicorp/nomad/v2/client/commonplugins" ) type ExternalPluginProvider struct { diff --git a/client/allocrunner/taskrunner/secrets/plugin_provider_test.go b/client/allocrunner/taskrunner/secrets/plugin_provider_test.go index 40c331f0145..f0ed258fc5b 100644 --- a/client/allocrunner/taskrunner/secrets/plugin_provider_test.go +++ b/client/allocrunner/taskrunner/secrets/plugin_provider_test.go @@ -8,7 +8,7 @@ import ( "errors" "testing" - "github.com/hashicorp/nomad/client/commonplugins" + "github.com/hashicorp/nomad/v2/client/commonplugins" "github.com/shoenig/test/must" "github.com/stretchr/testify/mock" ) diff --git a/client/allocrunner/taskrunner/secrets/vault_provider.go b/client/allocrunner/taskrunner/secrets/vault_provider.go index cde9b3ccb52..8ae0b993a44 100644 --- a/client/allocrunner/taskrunner/secrets/vault_provider.go +++ b/client/allocrunner/taskrunner/secrets/vault_provider.go @@ -10,7 +10,7 @@ import ( "strings" "github.com/go-viper/mapstructure/v2" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/nomad/structs" ) const ( diff --git a/client/allocrunner/taskrunner/secrets/vault_provider_test.go b/client/allocrunner/taskrunner/secrets/vault_provider_test.go index bf38390a091..c1f5c1fc73b 100644 --- a/client/allocrunner/taskrunner/secrets/vault_provider_test.go +++ b/client/allocrunner/taskrunner/secrets/vault_provider_test.go @@ -6,7 +6,7 @@ package secrets import ( "testing" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/nomad/structs" "github.com/shoenig/test/must" ) diff --git a/client/allocrunner/taskrunner/secrets_hook.go b/client/allocrunner/taskrunner/secrets_hook.go index 6f1151d1081..4c00ea44cda 100644 --- a/client/allocrunner/taskrunner/secrets_hook.go +++ b/client/allocrunner/taskrunner/secrets_hook.go @@ -13,14 +13,14 @@ import ( "github.com/hashicorp/go-envparse" log "github.com/hashicorp/go-hclog" "github.com/hashicorp/go-multierror" - "github.com/hashicorp/nomad/client/allocrunner/interfaces" - ti "github.com/hashicorp/nomad/client/allocrunner/taskrunner/interfaces" - "github.com/hashicorp/nomad/client/allocrunner/taskrunner/secrets" - "github.com/hashicorp/nomad/client/allocrunner/taskrunner/template" - "github.com/hashicorp/nomad/client/commonplugins" - "github.com/hashicorp/nomad/client/config" - "github.com/hashicorp/nomad/client/taskenv" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/client/allocrunner/interfaces" + ti "github.com/hashicorp/nomad/v2/client/allocrunner/taskrunner/interfaces" + "github.com/hashicorp/nomad/v2/client/allocrunner/taskrunner/secrets" + "github.com/hashicorp/nomad/v2/client/allocrunner/taskrunner/template" + "github.com/hashicorp/nomad/v2/client/commonplugins" + "github.com/hashicorp/nomad/v2/client/config" + "github.com/hashicorp/nomad/v2/client/taskenv" + "github.com/hashicorp/nomad/v2/nomad/structs" ) type TemplateProvider interface { diff --git a/client/allocrunner/taskrunner/secrets_hook_test.go b/client/allocrunner/taskrunner/secrets_hook_test.go index eae0f9b33da..ca8dfc97940 100644 --- a/client/allocrunner/taskrunner/secrets_hook_test.go +++ b/client/allocrunner/taskrunner/secrets_hook_test.go @@ -14,17 +14,17 @@ import ( "testing" "time" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/client/allocdir" - "github.com/hashicorp/nomad/client/allocrunner/interfaces" - trtesting "github.com/hashicorp/nomad/client/allocrunner/taskrunner/testing" - "github.com/hashicorp/nomad/client/config" - "github.com/hashicorp/nomad/client/taskenv" - "github.com/hashicorp/nomad/helper/bufconndialer" - "github.com/hashicorp/nomad/helper/testlog" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" - structsc "github.com/hashicorp/nomad/nomad/structs/config" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/client/allocdir" + "github.com/hashicorp/nomad/v2/client/allocrunner/interfaces" + trtesting "github.com/hashicorp/nomad/v2/client/allocrunner/taskrunner/testing" + "github.com/hashicorp/nomad/v2/client/config" + "github.com/hashicorp/nomad/v2/client/taskenv" + "github.com/hashicorp/nomad/v2/helper/bufconndialer" + "github.com/hashicorp/nomad/v2/helper/testlog" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" + structsc "github.com/hashicorp/nomad/v2/nomad/structs/config" "github.com/shoenig/test/must" ) diff --git a/client/allocrunner/taskrunner/service_hook.go b/client/allocrunner/taskrunner/service_hook.go index 52ebc8b3770..16f79cee2e5 100644 --- a/client/allocrunner/taskrunner/service_hook.go +++ b/client/allocrunner/taskrunner/service_hook.go @@ -9,14 +9,14 @@ import ( "sync" log "github.com/hashicorp/go-hclog" - "github.com/hashicorp/nomad/client/allocrunner/interfaces" - tinterfaces "github.com/hashicorp/nomad/client/allocrunner/taskrunner/interfaces" - "github.com/hashicorp/nomad/client/serviceregistration" - "github.com/hashicorp/nomad/client/serviceregistration/wrapper" - cstructs "github.com/hashicorp/nomad/client/structs" - "github.com/hashicorp/nomad/client/taskenv" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/plugins/drivers" + "github.com/hashicorp/nomad/v2/client/allocrunner/interfaces" + tinterfaces "github.com/hashicorp/nomad/v2/client/allocrunner/taskrunner/interfaces" + "github.com/hashicorp/nomad/v2/client/serviceregistration" + "github.com/hashicorp/nomad/v2/client/serviceregistration/wrapper" + cstructs "github.com/hashicorp/nomad/v2/client/structs" + "github.com/hashicorp/nomad/v2/client/taskenv" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/plugins/drivers" ) var _ interfaces.TaskPoststartHook = &serviceHook{} diff --git a/client/allocrunner/taskrunner/service_hook_test.go b/client/allocrunner/taskrunner/service_hook_test.go index 971185242eb..8588a2d7563 100644 --- a/client/allocrunner/taskrunner/service_hook_test.go +++ b/client/allocrunner/taskrunner/service_hook_test.go @@ -7,16 +7,16 @@ import ( "context" "testing" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/client/allocrunner/interfaces" - regMock "github.com/hashicorp/nomad/client/serviceregistration/mock" - "github.com/hashicorp/nomad/client/serviceregistration/wrapper" - cstructs "github.com/hashicorp/nomad/client/structs" - "github.com/hashicorp/nomad/client/taskenv" - agentconsul "github.com/hashicorp/nomad/command/agent/consul" - "github.com/hashicorp/nomad/helper/testlog" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/client/allocrunner/interfaces" + regMock "github.com/hashicorp/nomad/v2/client/serviceregistration/mock" + "github.com/hashicorp/nomad/v2/client/serviceregistration/wrapper" + cstructs "github.com/hashicorp/nomad/v2/client/structs" + "github.com/hashicorp/nomad/v2/client/taskenv" + agentconsul "github.com/hashicorp/nomad/v2/command/agent/consul" + "github.com/hashicorp/nomad/v2/helper/testlog" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" "github.com/stretchr/testify/require" ) diff --git a/client/allocrunner/taskrunner/sids_hook.go b/client/allocrunner/taskrunner/sids_hook.go index e98be7fc8ef..91849f43f5e 100644 --- a/client/allocrunner/taskrunner/sids_hook.go +++ b/client/allocrunner/taskrunner/sids_hook.go @@ -9,10 +9,10 @@ import ( "sync" "github.com/hashicorp/go-hclog" - "github.com/hashicorp/nomad/client/allocrunner/interfaces" - ti "github.com/hashicorp/nomad/client/allocrunner/taskrunner/interfaces" - cstructs "github.com/hashicorp/nomad/client/structs" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/client/allocrunner/interfaces" + ti "github.com/hashicorp/nomad/v2/client/allocrunner/taskrunner/interfaces" + cstructs "github.com/hashicorp/nomad/v2/client/structs" + "github.com/hashicorp/nomad/v2/nomad/structs" ) const ( diff --git a/client/allocrunner/taskrunner/sids_hook_test.go b/client/allocrunner/taskrunner/sids_hook_test.go index 375c18fb1c5..a6e9cd0ad2f 100644 --- a/client/allocrunner/taskrunner/sids_hook_test.go +++ b/client/allocrunner/taskrunner/sids_hook_test.go @@ -14,9 +14,9 @@ import ( "path/filepath" "testing" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/client/allocrunner/interfaces" - "github.com/hashicorp/nomad/helper/uuid" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/client/allocrunner/interfaces" + "github.com/hashicorp/nomad/v2/helper/uuid" "github.com/stretchr/testify/require" "golang.org/x/sys/unix" ) diff --git a/client/allocrunner/taskrunner/state/state.go b/client/allocrunner/taskrunner/state/state.go index 0767ac4262b..6a00f2d80c3 100644 --- a/client/allocrunner/taskrunner/state/state.go +++ b/client/allocrunner/taskrunner/state/state.go @@ -6,7 +6,7 @@ package state import ( "maps" - "github.com/hashicorp/nomad/plugins/drivers" + "github.com/hashicorp/nomad/v2/plugins/drivers" ) // LocalState is Task state which is persisted for use when restarting Nomad diff --git a/client/allocrunner/taskrunner/stats_hook.go b/client/allocrunner/taskrunner/stats_hook.go index f7c09bd78c0..69364dfe91e 100644 --- a/client/allocrunner/taskrunner/stats_hook.go +++ b/client/allocrunner/taskrunner/stats_hook.go @@ -9,11 +9,11 @@ import ( "time" hclog "github.com/hashicorp/go-hclog" - "github.com/hashicorp/nomad/client/allocrunner/interfaces" - cstructs "github.com/hashicorp/nomad/client/structs" - "github.com/hashicorp/nomad/helper" - "github.com/hashicorp/nomad/nomad/structs" - bstructs "github.com/hashicorp/nomad/plugins/base/structs" + "github.com/hashicorp/nomad/v2/client/allocrunner/interfaces" + cstructs "github.com/hashicorp/nomad/v2/client/structs" + "github.com/hashicorp/nomad/v2/helper" + "github.com/hashicorp/nomad/v2/nomad/structs" + bstructs "github.com/hashicorp/nomad/v2/plugins/base/structs" ) // StatsUpdater is the interface required by the StatsHook to update stats. diff --git a/client/allocrunner/taskrunner/stats_hook_test.go b/client/allocrunner/taskrunner/stats_hook_test.go index dd3bf382f7e..29c5b7d54e9 100644 --- a/client/allocrunner/taskrunner/stats_hook_test.go +++ b/client/allocrunner/taskrunner/stats_hook_test.go @@ -9,10 +9,10 @@ import ( "testing" "time" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/client/allocrunner/interfaces" - cstructs "github.com/hashicorp/nomad/client/structs" - "github.com/hashicorp/nomad/helper/testlog" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/client/allocrunner/interfaces" + cstructs "github.com/hashicorp/nomad/v2/client/structs" + "github.com/hashicorp/nomad/v2/helper/testlog" "github.com/shoenig/test/must" ) diff --git a/client/allocrunner/taskrunner/task_dir_hook.go b/client/allocrunner/taskrunner/task_dir_hook.go index d4c79c66412..5acd3f042fd 100644 --- a/client/allocrunner/taskrunner/task_dir_hook.go +++ b/client/allocrunner/taskrunner/task_dir_hook.go @@ -10,12 +10,12 @@ import ( log "github.com/hashicorp/go-hclog" - "github.com/hashicorp/nomad/client/allocdir" - "github.com/hashicorp/nomad/client/allocrunner/interfaces" - cconfig "github.com/hashicorp/nomad/client/config" - "github.com/hashicorp/nomad/client/taskenv" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/plugins/drivers/fsisolation" + "github.com/hashicorp/nomad/v2/client/allocdir" + "github.com/hashicorp/nomad/v2/client/allocrunner/interfaces" + cconfig "github.com/hashicorp/nomad/v2/client/config" + "github.com/hashicorp/nomad/v2/client/taskenv" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/plugins/drivers/fsisolation" ) const ( diff --git a/client/allocrunner/taskrunner/task_runner.go b/client/allocrunner/taskrunner/task_runner.go index 9e12992bda5..6aa290c3977 100644 --- a/client/allocrunner/taskrunner/task_runner.go +++ b/client/allocrunner/taskrunner/task_runner.go @@ -16,34 +16,34 @@ import ( metrics "github.com/hashicorp/go-metrics/compat" multierror "github.com/hashicorp/go-multierror" "github.com/hashicorp/hcl/v2/hcldec" - "github.com/hashicorp/nomad/client/allocdir" - "github.com/hashicorp/nomad/client/allocrunner/hookstats" - "github.com/hashicorp/nomad/client/allocrunner/interfaces" - "github.com/hashicorp/nomad/client/allocrunner/taskrunner/restarts" - "github.com/hashicorp/nomad/client/allocrunner/taskrunner/state" - "github.com/hashicorp/nomad/client/config" - "github.com/hashicorp/nomad/client/consul" - "github.com/hashicorp/nomad/client/devicemanager" - "github.com/hashicorp/nomad/client/dynamicplugins" - cinterfaces "github.com/hashicorp/nomad/client/interfaces" - "github.com/hashicorp/nomad/client/lib/cgroupslib" - "github.com/hashicorp/nomad/client/pluginmanager/csimanager" - "github.com/hashicorp/nomad/client/pluginmanager/drivermanager" - "github.com/hashicorp/nomad/client/serviceregistration" - "github.com/hashicorp/nomad/client/serviceregistration/wrapper" - cstate "github.com/hashicorp/nomad/client/state" - cstructs "github.com/hashicorp/nomad/client/structs" - "github.com/hashicorp/nomad/client/taskenv" - "github.com/hashicorp/nomad/client/vaultclient" - "github.com/hashicorp/nomad/client/widmgr" - "github.com/hashicorp/nomad/helper" - "github.com/hashicorp/nomad/helper/pluginutils/hclspecutils" - "github.com/hashicorp/nomad/helper/pluginutils/hclutils" - "github.com/hashicorp/nomad/helper/users/dynamic" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/nomad/structs" - bstructs "github.com/hashicorp/nomad/plugins/base/structs" - "github.com/hashicorp/nomad/plugins/drivers" + "github.com/hashicorp/nomad/v2/client/allocdir" + "github.com/hashicorp/nomad/v2/client/allocrunner/hookstats" + "github.com/hashicorp/nomad/v2/client/allocrunner/interfaces" + "github.com/hashicorp/nomad/v2/client/allocrunner/taskrunner/restarts" + "github.com/hashicorp/nomad/v2/client/allocrunner/taskrunner/state" + "github.com/hashicorp/nomad/v2/client/config" + "github.com/hashicorp/nomad/v2/client/consul" + "github.com/hashicorp/nomad/v2/client/devicemanager" + "github.com/hashicorp/nomad/v2/client/dynamicplugins" + cinterfaces "github.com/hashicorp/nomad/v2/client/interfaces" + "github.com/hashicorp/nomad/v2/client/lib/cgroupslib" + "github.com/hashicorp/nomad/v2/client/pluginmanager/csimanager" + "github.com/hashicorp/nomad/v2/client/pluginmanager/drivermanager" + "github.com/hashicorp/nomad/v2/client/serviceregistration" + "github.com/hashicorp/nomad/v2/client/serviceregistration/wrapper" + cstate "github.com/hashicorp/nomad/v2/client/state" + cstructs "github.com/hashicorp/nomad/v2/client/structs" + "github.com/hashicorp/nomad/v2/client/taskenv" + "github.com/hashicorp/nomad/v2/client/vaultclient" + "github.com/hashicorp/nomad/v2/client/widmgr" + "github.com/hashicorp/nomad/v2/helper" + "github.com/hashicorp/nomad/v2/helper/pluginutils/hclspecutils" + "github.com/hashicorp/nomad/v2/helper/pluginutils/hclutils" + "github.com/hashicorp/nomad/v2/helper/users/dynamic" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/nomad/structs" + bstructs "github.com/hashicorp/nomad/v2/plugins/base/structs" + "github.com/hashicorp/nomad/v2/plugins/drivers" ) const ( diff --git a/client/allocrunner/taskrunner/task_runner_getters.go b/client/allocrunner/taskrunner/task_runner_getters.go index 011c72ac419..dfc87334698 100644 --- a/client/allocrunner/taskrunner/task_runner_getters.go +++ b/client/allocrunner/taskrunner/task_runner_getters.go @@ -4,8 +4,8 @@ package taskrunner import ( - "github.com/hashicorp/nomad/client/allocrunner/taskrunner/state" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/client/allocrunner/taskrunner/state" + "github.com/hashicorp/nomad/v2/nomad/structs" ) func (tr *TaskRunner) Alloc() *structs.Allocation { diff --git a/client/allocrunner/taskrunner/task_runner_hooks.go b/client/allocrunner/taskrunner/task_runner_hooks.go index 30d6be0cffa..239db953dcb 100644 --- a/client/allocrunner/taskrunner/task_runner_hooks.go +++ b/client/allocrunner/taskrunner/task_runner_hooks.go @@ -11,11 +11,11 @@ import ( "github.com/LK4D4/joincontext" multierror "github.com/hashicorp/go-multierror" - "github.com/hashicorp/nomad/client/allocrunner/interfaces" - te "github.com/hashicorp/nomad/client/allocrunner/taskrunner/errors" - "github.com/hashicorp/nomad/client/allocrunner/taskrunner/state" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/plugins/drivers" + "github.com/hashicorp/nomad/v2/client/allocrunner/interfaces" + te "github.com/hashicorp/nomad/v2/client/allocrunner/taskrunner/errors" + "github.com/hashicorp/nomad/v2/client/allocrunner/taskrunner/state" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/plugins/drivers" ) // hookResources captures the resources for the task provided by hooks. diff --git a/client/allocrunner/taskrunner/task_runner_linux_test.go b/client/allocrunner/taskrunner/task_runner_linux_test.go index 75abdfef40d..e8b7b79fa21 100644 --- a/client/allocrunner/taskrunner/task_runner_linux_test.go +++ b/client/allocrunner/taskrunner/task_runner_linux_test.go @@ -24,37 +24,37 @@ import ( "github.com/golang/snappy" consulapi "github.com/hashicorp/consul/api" metrics "github.com/hashicorp/go-metrics/compat" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/client/allocdir" - "github.com/hashicorp/nomad/client/allocrunner/hookstats" - "github.com/hashicorp/nomad/client/allocrunner/interfaces" - te "github.com/hashicorp/nomad/client/allocrunner/taskrunner/errors" - "github.com/hashicorp/nomad/client/allocrunner/taskrunner/getter" - "github.com/hashicorp/nomad/client/config" - "github.com/hashicorp/nomad/client/devicemanager" - "github.com/hashicorp/nomad/client/lib/cgroupslib" - "github.com/hashicorp/nomad/client/lib/proclib" - "github.com/hashicorp/nomad/client/pluginmanager/drivermanager" - regMock "github.com/hashicorp/nomad/client/serviceregistration/mock" - "github.com/hashicorp/nomad/client/serviceregistration/wrapper" - cstate "github.com/hashicorp/nomad/client/state" - cstructs "github.com/hashicorp/nomad/client/structs" - "github.com/hashicorp/nomad/client/taskenv" - ctestutil "github.com/hashicorp/nomad/client/testutil" - "github.com/hashicorp/nomad/client/vaultclient" - "github.com/hashicorp/nomad/client/widmgr" - agentconsul "github.com/hashicorp/nomad/command/agent/consul" - mockdriver "github.com/hashicorp/nomad/drivers/mock" - "github.com/hashicorp/nomad/drivers/rawexec" - "github.com/hashicorp/nomad/helper" - "github.com/hashicorp/nomad/helper/testlog" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" - structsc "github.com/hashicorp/nomad/nomad/structs/config" - "github.com/hashicorp/nomad/plugins/device" - "github.com/hashicorp/nomad/plugins/drivers" - "github.com/hashicorp/nomad/plugins/drivers/fsisolation" - "github.com/hashicorp/nomad/testutil" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/client/allocdir" + "github.com/hashicorp/nomad/v2/client/allocrunner/hookstats" + "github.com/hashicorp/nomad/v2/client/allocrunner/interfaces" + te "github.com/hashicorp/nomad/v2/client/allocrunner/taskrunner/errors" + "github.com/hashicorp/nomad/v2/client/allocrunner/taskrunner/getter" + "github.com/hashicorp/nomad/v2/client/config" + "github.com/hashicorp/nomad/v2/client/devicemanager" + "github.com/hashicorp/nomad/v2/client/lib/cgroupslib" + "github.com/hashicorp/nomad/v2/client/lib/proclib" + "github.com/hashicorp/nomad/v2/client/pluginmanager/drivermanager" + regMock "github.com/hashicorp/nomad/v2/client/serviceregistration/mock" + "github.com/hashicorp/nomad/v2/client/serviceregistration/wrapper" + cstate "github.com/hashicorp/nomad/v2/client/state" + cstructs "github.com/hashicorp/nomad/v2/client/structs" + "github.com/hashicorp/nomad/v2/client/taskenv" + ctestutil "github.com/hashicorp/nomad/v2/client/testutil" + "github.com/hashicorp/nomad/v2/client/vaultclient" + "github.com/hashicorp/nomad/v2/client/widmgr" + agentconsul "github.com/hashicorp/nomad/v2/command/agent/consul" + mockdriver "github.com/hashicorp/nomad/v2/drivers/mock" + "github.com/hashicorp/nomad/v2/drivers/rawexec" + "github.com/hashicorp/nomad/v2/helper" + "github.com/hashicorp/nomad/v2/helper/testlog" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" + structsc "github.com/hashicorp/nomad/v2/nomad/structs/config" + "github.com/hashicorp/nomad/v2/plugins/device" + "github.com/hashicorp/nomad/v2/plugins/drivers" + "github.com/hashicorp/nomad/v2/plugins/drivers/fsisolation" + "github.com/hashicorp/nomad/v2/testutil" "github.com/kr/pretty" "github.com/shoenig/test" "github.com/shoenig/test/must" diff --git a/client/allocrunner/taskrunner/tasklet.go b/client/allocrunner/taskrunner/tasklet.go index cedffb7b8a1..c31868948b2 100644 --- a/client/allocrunner/taskrunner/tasklet.go +++ b/client/allocrunner/taskrunner/tasklet.go @@ -10,7 +10,7 @@ import ( log "github.com/hashicorp/go-hclog" metrics "github.com/hashicorp/go-metrics/compat" - "github.com/hashicorp/nomad/client/allocrunner/taskrunner/interfaces" + "github.com/hashicorp/nomad/v2/client/allocrunner/taskrunner/interfaces" ) // contextExec allows canceling a interfaces.ScriptExecutor with a context. diff --git a/client/allocrunner/taskrunner/tasklet_test.go b/client/allocrunner/taskrunner/tasklet_test.go index df88679f977..35b0e0f91b0 100644 --- a/client/allocrunner/taskrunner/tasklet_test.go +++ b/client/allocrunner/taskrunner/tasklet_test.go @@ -13,10 +13,10 @@ import ( "time" hclog "github.com/hashicorp/go-hclog" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/client/allocrunner/taskrunner/interfaces" - "github.com/hashicorp/nomad/helper/testlog" - "github.com/hashicorp/nomad/helper/testtask" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/client/allocrunner/taskrunner/interfaces" + "github.com/hashicorp/nomad/v2/helper/testlog" + "github.com/hashicorp/nomad/v2/helper/testtask" "github.com/stretchr/testify/assert" ) diff --git a/client/allocrunner/taskrunner/template/template.go b/client/allocrunner/taskrunner/template/template.go index 8f2d4bb9e13..7ac5b26bc06 100644 --- a/client/allocrunner/taskrunner/template/template.go +++ b/client/allocrunner/taskrunner/template/template.go @@ -23,12 +23,12 @@ import ( envparse "github.com/hashicorp/go-envparse" "github.com/hashicorp/go-hclog" multierror "github.com/hashicorp/go-multierror" - te "github.com/hashicorp/nomad/client/allocrunner/taskrunner/errors" - "github.com/hashicorp/nomad/client/allocrunner/taskrunner/interfaces" - "github.com/hashicorp/nomad/client/config" - "github.com/hashicorp/nomad/client/taskenv" - "github.com/hashicorp/nomad/nomad/structs" - structsc "github.com/hashicorp/nomad/nomad/structs/config" + te "github.com/hashicorp/nomad/v2/client/allocrunner/taskrunner/errors" + "github.com/hashicorp/nomad/v2/client/allocrunner/taskrunner/interfaces" + "github.com/hashicorp/nomad/v2/client/config" + "github.com/hashicorp/nomad/v2/client/taskenv" + "github.com/hashicorp/nomad/v2/nomad/structs" + structsc "github.com/hashicorp/nomad/v2/nomad/structs/config" ) const ( diff --git a/client/allocrunner/taskrunner/template/template_default.go b/client/allocrunner/taskrunner/template/template_default.go index 71ae21c5199..2c25c228926 100644 --- a/client/allocrunner/taskrunner/template/template_default.go +++ b/client/allocrunner/taskrunner/template/template_default.go @@ -17,8 +17,8 @@ import ( "time" "github.com/hashicorp/consul-template/renderer" - trenderer "github.com/hashicorp/nomad/client/allocrunner/taskrunner/template/renderer" - "github.com/hashicorp/nomad/helper/subproc" + trenderer "github.com/hashicorp/nomad/v2/client/allocrunner/taskrunner/template/renderer" + "github.com/hashicorp/nomad/v2/helper/subproc" ) // renderTemplateInSandbox runs the template-render command in a subprocess that diff --git a/client/allocrunner/taskrunner/template/template_default_test.go b/client/allocrunner/taskrunner/template/template_default_test.go index 6b7b20cdcff..4e747638409 100644 --- a/client/allocrunner/taskrunner/template/template_default_test.go +++ b/client/allocrunner/taskrunner/template/template_default_test.go @@ -13,12 +13,12 @@ import ( "testing" "time" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/client/taskenv" - clienttestutil "github.com/hashicorp/nomad/client/testutil" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/testutil" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/client/taskenv" + clienttestutil "github.com/hashicorp/nomad/v2/client/testutil" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/testutil" "github.com/shoenig/test/must" ) diff --git a/client/allocrunner/taskrunner/template/template_test.go b/client/allocrunner/taskrunner/template/template_test.go index b1c8cd55123..986ebfda70b 100644 --- a/client/allocrunner/taskrunner/template/template_test.go +++ b/client/allocrunner/taskrunner/template/template_test.go @@ -22,20 +22,20 @@ import ( ctconf "github.com/hashicorp/consul-template/config" templateconfig "github.com/hashicorp/consul-template/config" ctestutil "github.com/hashicorp/consul/sdk/testutil" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/client/allocdir" - te "github.com/hashicorp/nomad/client/allocrunner/taskrunner/errors" - trtesting "github.com/hashicorp/nomad/client/allocrunner/taskrunner/testing" - "github.com/hashicorp/nomad/client/config" - "github.com/hashicorp/nomad/client/taskenv" - clienttestutil "github.com/hashicorp/nomad/client/testutil" - "github.com/hashicorp/nomad/helper/testlog" - "github.com/hashicorp/nomad/helper/users" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" - sconfig "github.com/hashicorp/nomad/nomad/structs/config" - "github.com/hashicorp/nomad/testutil" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/client/allocdir" + te "github.com/hashicorp/nomad/v2/client/allocrunner/taskrunner/errors" + trtesting "github.com/hashicorp/nomad/v2/client/allocrunner/taskrunner/testing" + "github.com/hashicorp/nomad/v2/client/config" + "github.com/hashicorp/nomad/v2/client/taskenv" + clienttestutil "github.com/hashicorp/nomad/v2/client/testutil" + "github.com/hashicorp/nomad/v2/helper/testlog" + "github.com/hashicorp/nomad/v2/helper/users" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" + sconfig "github.com/hashicorp/nomad/v2/nomad/structs/config" + "github.com/hashicorp/nomad/v2/testutil" "github.com/kr/pretty" "github.com/shoenig/test" "github.com/shoenig/test/must" diff --git a/client/allocrunner/taskrunner/template_hook.go b/client/allocrunner/taskrunner/template_hook.go index 45a3b1b5341..8bc62f8adee 100644 --- a/client/allocrunner/taskrunner/template_hook.go +++ b/client/allocrunner/taskrunner/template_hook.go @@ -9,13 +9,13 @@ import ( "sync" log "github.com/hashicorp/go-hclog" - "github.com/hashicorp/nomad/client/allocrunner/interfaces" - ti "github.com/hashicorp/nomad/client/allocrunner/taskrunner/interfaces" - "github.com/hashicorp/nomad/client/allocrunner/taskrunner/template" - "github.com/hashicorp/nomad/client/config" - cstructs "github.com/hashicorp/nomad/client/structs" - "github.com/hashicorp/nomad/client/taskenv" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/client/allocrunner/interfaces" + ti "github.com/hashicorp/nomad/v2/client/allocrunner/taskrunner/interfaces" + "github.com/hashicorp/nomad/v2/client/allocrunner/taskrunner/template" + "github.com/hashicorp/nomad/v2/client/config" + cstructs "github.com/hashicorp/nomad/v2/client/structs" + "github.com/hashicorp/nomad/v2/client/taskenv" + "github.com/hashicorp/nomad/v2/nomad/structs" ) const ( diff --git a/client/allocrunner/taskrunner/template_hook_test.go b/client/allocrunner/taskrunner/template_hook_test.go index 0afd7320aec..6e63747fb04 100644 --- a/client/allocrunner/taskrunner/template_hook_test.go +++ b/client/allocrunner/taskrunner/template_hook_test.go @@ -16,18 +16,18 @@ import ( "time" consulapi "github.com/hashicorp/consul/api" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/client/allocdir" - "github.com/hashicorp/nomad/client/allocrunner/interfaces" - trtesting "github.com/hashicorp/nomad/client/allocrunner/taskrunner/testing" - "github.com/hashicorp/nomad/client/config" - cstructs "github.com/hashicorp/nomad/client/structs" - "github.com/hashicorp/nomad/client/taskenv" - "github.com/hashicorp/nomad/helper/testlog" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" - structsc "github.com/hashicorp/nomad/nomad/structs/config" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/client/allocdir" + "github.com/hashicorp/nomad/v2/client/allocrunner/interfaces" + trtesting "github.com/hashicorp/nomad/v2/client/allocrunner/taskrunner/testing" + "github.com/hashicorp/nomad/v2/client/config" + cstructs "github.com/hashicorp/nomad/v2/client/structs" + "github.com/hashicorp/nomad/v2/client/taskenv" + "github.com/hashicorp/nomad/v2/helper/testlog" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" + structsc "github.com/hashicorp/nomad/v2/nomad/structs/config" "github.com/shoenig/test/must" ) diff --git a/client/allocrunner/taskrunner/testing/testing.go b/client/allocrunner/taskrunner/testing/testing.go index 1472dc4e129..68a71f67e6f 100644 --- a/client/allocrunner/taskrunner/testing/testing.go +++ b/client/allocrunner/taskrunner/testing/testing.go @@ -8,7 +8,7 @@ import ( "sync" "time" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/nomad/structs" ) // MockEmitter is a mock of the EventEmitter interface. diff --git a/client/allocrunner/taskrunner/validate_hook.go b/client/allocrunner/taskrunner/validate_hook.go index f6558692a0d..8e96c0fbfa4 100644 --- a/client/allocrunner/taskrunner/validate_hook.go +++ b/client/allocrunner/taskrunner/validate_hook.go @@ -9,10 +9,10 @@ import ( log "github.com/hashicorp/go-hclog" multierror "github.com/hashicorp/go-multierror" - "github.com/hashicorp/nomad/client/allocrunner/interfaces" - "github.com/hashicorp/nomad/client/config" - "github.com/hashicorp/nomad/client/taskenv" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/client/allocrunner/interfaces" + "github.com/hashicorp/nomad/v2/client/config" + "github.com/hashicorp/nomad/v2/client/taskenv" + "github.com/hashicorp/nomad/v2/nomad/structs" ) // validateHook validates the task is able to be run. diff --git a/client/allocrunner/taskrunner/validate_hook_test.go b/client/allocrunner/taskrunner/validate_hook_test.go index 16d3917d5d0..1e05cc266c4 100644 --- a/client/allocrunner/taskrunner/validate_hook_test.go +++ b/client/allocrunner/taskrunner/validate_hook_test.go @@ -6,10 +6,10 @@ package taskrunner import ( "testing" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/client/config" - "github.com/hashicorp/nomad/client/taskenv" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/client/config" + "github.com/hashicorp/nomad/v2/client/taskenv" + "github.com/hashicorp/nomad/v2/nomad/structs" "github.com/stretchr/testify/require" ) diff --git a/client/allocrunner/taskrunner/vault_hook.go b/client/allocrunner/taskrunner/vault_hook.go index 5dd1597bfdc..a720a6be3ac 100644 --- a/client/allocrunner/taskrunner/vault_hook.go +++ b/client/allocrunner/taskrunner/vault_hook.go @@ -17,13 +17,13 @@ import ( "github.com/hashicorp/go-hclog" log "github.com/hashicorp/go-hclog" - "github.com/hashicorp/nomad/client/allocrunner/interfaces" - ti "github.com/hashicorp/nomad/client/allocrunner/taskrunner/interfaces" - "github.com/hashicorp/nomad/client/vaultclient" - "github.com/hashicorp/nomad/client/widmgr" - "github.com/hashicorp/nomad/helper" - "github.com/hashicorp/nomad/nomad/structs" - sconfig "github.com/hashicorp/nomad/nomad/structs/config" + "github.com/hashicorp/nomad/v2/client/allocrunner/interfaces" + ti "github.com/hashicorp/nomad/v2/client/allocrunner/taskrunner/interfaces" + "github.com/hashicorp/nomad/v2/client/vaultclient" + "github.com/hashicorp/nomad/v2/client/widmgr" + "github.com/hashicorp/nomad/v2/helper" + "github.com/hashicorp/nomad/v2/nomad/structs" + sconfig "github.com/hashicorp/nomad/v2/nomad/structs/config" ) const ( diff --git a/client/allocrunner/taskrunner/vault_hook_test.go b/client/allocrunner/taskrunner/vault_hook_test.go index 657b1a9558e..f30de6412ec 100644 --- a/client/allocrunner/taskrunner/vault_hook_test.go +++ b/client/allocrunner/taskrunner/vault_hook_test.go @@ -13,18 +13,18 @@ import ( "time" "github.com/hashicorp/go-hclog" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/client/allocdir" - "github.com/hashicorp/nomad/client/allocrunner/interfaces" - trtesting "github.com/hashicorp/nomad/client/allocrunner/taskrunner/testing" - cstate "github.com/hashicorp/nomad/client/state" - "github.com/hashicorp/nomad/client/taskenv" - "github.com/hashicorp/nomad/client/vaultclient" - "github.com/hashicorp/nomad/client/widmgr" - "github.com/hashicorp/nomad/helper/testlog" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" - sconfig "github.com/hashicorp/nomad/nomad/structs/config" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/client/allocdir" + "github.com/hashicorp/nomad/v2/client/allocrunner/interfaces" + trtesting "github.com/hashicorp/nomad/v2/client/allocrunner/taskrunner/testing" + cstate "github.com/hashicorp/nomad/v2/client/state" + "github.com/hashicorp/nomad/v2/client/taskenv" + "github.com/hashicorp/nomad/v2/client/vaultclient" + "github.com/hashicorp/nomad/v2/client/widmgr" + "github.com/hashicorp/nomad/v2/helper/testlog" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" + sconfig "github.com/hashicorp/nomad/v2/nomad/structs/config" "github.com/shoenig/test/must" "github.com/shoenig/test/wait" ) diff --git a/client/allocrunner/taskrunner/volume_hook.go b/client/allocrunner/taskrunner/volume_hook.go index 53ed6f5d805..738774641c9 100644 --- a/client/allocrunner/taskrunner/volume_hook.go +++ b/client/allocrunner/taskrunner/volume_hook.go @@ -9,10 +9,10 @@ import ( log "github.com/hashicorp/go-hclog" multierror "github.com/hashicorp/go-multierror" - "github.com/hashicorp/nomad/client/allocrunner/interfaces" - "github.com/hashicorp/nomad/client/taskenv" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/plugins/drivers" + "github.com/hashicorp/nomad/v2/client/allocrunner/interfaces" + "github.com/hashicorp/nomad/v2/client/taskenv" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/plugins/drivers" ) type volumeHook struct { diff --git a/client/allocrunner/taskrunner/volume_hook_test.go b/client/allocrunner/taskrunner/volume_hook_test.go index 0052c31ccff..03a9ae9339d 100644 --- a/client/allocrunner/taskrunner/volume_hook_test.go +++ b/client/allocrunner/taskrunner/volume_hook_test.go @@ -6,16 +6,16 @@ package taskrunner import ( "testing" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/client/allocrunner/interfaces" - "github.com/hashicorp/nomad/client/pluginmanager/csimanager" - cstructs "github.com/hashicorp/nomad/client/structs" - "github.com/hashicorp/nomad/client/taskenv" - "github.com/hashicorp/nomad/helper/testlog" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/plugins/drivers" - dtu "github.com/hashicorp/nomad/plugins/drivers/testutils" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/client/allocrunner/interfaces" + "github.com/hashicorp/nomad/v2/client/pluginmanager/csimanager" + cstructs "github.com/hashicorp/nomad/v2/client/structs" + "github.com/hashicorp/nomad/v2/client/taskenv" + "github.com/hashicorp/nomad/v2/helper/testlog" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/plugins/drivers" + dtu "github.com/hashicorp/nomad/v2/plugins/drivers/testutils" "github.com/stretchr/testify/require" ) diff --git a/client/allocrunner/taskrunner/wrangler_hook.go b/client/allocrunner/taskrunner/wrangler_hook.go index 60ed48230c1..2202cbc3651 100644 --- a/client/allocrunner/taskrunner/wrangler_hook.go +++ b/client/allocrunner/taskrunner/wrangler_hook.go @@ -7,9 +7,9 @@ import ( "context" "github.com/hashicorp/go-hclog" - ifs "github.com/hashicorp/nomad/client/allocrunner/interfaces" - cifs "github.com/hashicorp/nomad/client/interfaces" - "github.com/hashicorp/nomad/client/lib/proclib" + ifs "github.com/hashicorp/nomad/v2/client/allocrunner/interfaces" + cifs "github.com/hashicorp/nomad/v2/client/interfaces" + "github.com/hashicorp/nomad/v2/client/lib/proclib" ) const ( diff --git a/client/allocrunner/testing.go b/client/allocrunner/testing.go index 88bc3c3d22a..708a228f447 100644 --- a/client/allocrunner/testing.go +++ b/client/allocrunner/testing.go @@ -11,22 +11,22 @@ import ( "sync" "testing" - "github.com/hashicorp/nomad/client/allocrunner/interfaces" - "github.com/hashicorp/nomad/client/allocrunner/taskrunner/getter" - "github.com/hashicorp/nomad/client/allocwatcher" - "github.com/hashicorp/nomad/client/config" - clientconfig "github.com/hashicorp/nomad/client/config" - "github.com/hashicorp/nomad/client/devicemanager" - "github.com/hashicorp/nomad/client/lib/cgroupslib" - "github.com/hashicorp/nomad/client/lib/proclib" - "github.com/hashicorp/nomad/client/pluginmanager/drivermanager" - "github.com/hashicorp/nomad/client/serviceregistration/checks/checkstore" - "github.com/hashicorp/nomad/client/serviceregistration/mock" - "github.com/hashicorp/nomad/client/serviceregistration/wrapper" - "github.com/hashicorp/nomad/client/state" - "github.com/hashicorp/nomad/client/vaultclient" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/testutil" + "github.com/hashicorp/nomad/v2/client/allocrunner/interfaces" + "github.com/hashicorp/nomad/v2/client/allocrunner/taskrunner/getter" + "github.com/hashicorp/nomad/v2/client/allocwatcher" + "github.com/hashicorp/nomad/v2/client/config" + clientconfig "github.com/hashicorp/nomad/v2/client/config" + "github.com/hashicorp/nomad/v2/client/devicemanager" + "github.com/hashicorp/nomad/v2/client/lib/cgroupslib" + "github.com/hashicorp/nomad/v2/client/lib/proclib" + "github.com/hashicorp/nomad/v2/client/pluginmanager/drivermanager" + "github.com/hashicorp/nomad/v2/client/serviceregistration/checks/checkstore" + "github.com/hashicorp/nomad/v2/client/serviceregistration/mock" + "github.com/hashicorp/nomad/v2/client/serviceregistration/wrapper" + "github.com/hashicorp/nomad/v2/client/state" + "github.com/hashicorp/nomad/v2/client/vaultclient" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/testutil" "github.com/stretchr/testify/require" ) diff --git a/client/allocrunner/upstream_allocs_hook.go b/client/allocrunner/upstream_allocs_hook.go index 0272f2c4e25..a5ed55d26bb 100644 --- a/client/allocrunner/upstream_allocs_hook.go +++ b/client/allocrunner/upstream_allocs_hook.go @@ -7,9 +7,9 @@ import ( "context" log "github.com/hashicorp/go-hclog" - "github.com/hashicorp/nomad/client/allocrunner/interfaces" - "github.com/hashicorp/nomad/client/config" - "github.com/hashicorp/nomad/client/taskenv" + "github.com/hashicorp/nomad/v2/client/allocrunner/interfaces" + "github.com/hashicorp/nomad/v2/client/config" + "github.com/hashicorp/nomad/v2/client/taskenv" ) // upstreamAllocsHook waits for a PrevAllocWatcher to exit before allowing diff --git a/client/allocwatcher/alloc_watcher.go b/client/allocwatcher/alloc_watcher.go index c0b9ecb7f4f..1fd50864e30 100644 --- a/client/allocwatcher/alloc_watcher.go +++ b/client/allocwatcher/alloc_watcher.go @@ -16,12 +16,12 @@ import ( hclog "github.com/hashicorp/go-hclog" nomadapi "github.com/hashicorp/nomad/api" - "github.com/hashicorp/nomad/client/allocdir" - "github.com/hashicorp/nomad/client/config" - cstructs "github.com/hashicorp/nomad/client/structs" - "github.com/hashicorp/nomad/helper" - "github.com/hashicorp/nomad/helper/escapingfs" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/client/allocdir" + "github.com/hashicorp/nomad/v2/client/config" + cstructs "github.com/hashicorp/nomad/v2/client/structs" + "github.com/hashicorp/nomad/v2/helper" + "github.com/hashicorp/nomad/v2/helper/escapingfs" + "github.com/hashicorp/nomad/v2/nomad/structs" ) const ( diff --git a/client/allocwatcher/alloc_watcher_test.go b/client/allocwatcher/alloc_watcher_test.go index 2abb7933dbb..48f64ee01bb 100644 --- a/client/allocwatcher/alloc_watcher_test.go +++ b/client/allocwatcher/alloc_watcher_test.go @@ -16,13 +16,13 @@ import ( "time" hclog "github.com/hashicorp/go-hclog" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/client/allocdir" - cstructs "github.com/hashicorp/nomad/client/structs" - "github.com/hashicorp/nomad/helper/testlog" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/testutil" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/client/allocdir" + cstructs "github.com/hashicorp/nomad/v2/client/structs" + "github.com/hashicorp/nomad/v2/helper/testlog" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/testutil" "github.com/shoenig/test/must" "github.com/stretchr/testify/require" ) diff --git a/client/allocwatcher/alloc_watcher_unix_test.go b/client/allocwatcher/alloc_watcher_unix_test.go index 49e6f7e234e..6eb7b0c48eb 100644 --- a/client/allocwatcher/alloc_watcher_unix_test.go +++ b/client/allocwatcher/alloc_watcher_unix_test.go @@ -17,9 +17,9 @@ import ( "syscall" "testing" - "github.com/hashicorp/nomad/ci" - ctestutil "github.com/hashicorp/nomad/client/testutil" - "github.com/hashicorp/nomad/helper/testlog" + "github.com/hashicorp/nomad/v2/ci" + ctestutil "github.com/hashicorp/nomad/v2/client/testutil" + "github.com/hashicorp/nomad/v2/helper/testlog" "github.com/shoenig/test/must" ) diff --git a/client/allocwatcher/group_alloc_watcher.go b/client/allocwatcher/group_alloc_watcher.go index cf3f35c824e..998c88a81fd 100644 --- a/client/allocwatcher/group_alloc_watcher.go +++ b/client/allocwatcher/group_alloc_watcher.go @@ -9,7 +9,7 @@ import ( multierror "github.com/hashicorp/go-multierror" - "github.com/hashicorp/nomad/client/config" + "github.com/hashicorp/nomad/v2/client/config" ) type groupPrevAllocWatcher struct { diff --git a/client/allocwatcher/group_alloc_watcher_test.go b/client/allocwatcher/group_alloc_watcher_test.go index c2434650cf7..ff62f7d903d 100644 --- a/client/allocwatcher/group_alloc_watcher_test.go +++ b/client/allocwatcher/group_alloc_watcher_test.go @@ -8,10 +8,10 @@ import ( "fmt" "testing" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/client/config" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/testutil" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/client/config" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/testutil" "github.com/stretchr/testify/require" ) diff --git a/client/client.go b/client/client.go index e3dfe207426..7747ef0ff52 100644 --- a/client/client.go +++ b/client/client.go @@ -22,50 +22,50 @@ import ( hclog "github.com/hashicorp/go-hclog" metrics "github.com/hashicorp/go-metrics/compat" multierror "github.com/hashicorp/go-multierror" - "github.com/hashicorp/nomad/client/allocdir" - "github.com/hashicorp/nomad/client/allocrunner" - "github.com/hashicorp/nomad/client/allocrunner/interfaces" - arstate "github.com/hashicorp/nomad/client/allocrunner/state" - "github.com/hashicorp/nomad/client/allocrunner/taskrunner/getter" - "github.com/hashicorp/nomad/client/allocwatcher" - "github.com/hashicorp/nomad/client/config" - consulApiShim "github.com/hashicorp/nomad/client/consul" - "github.com/hashicorp/nomad/client/devicemanager" - "github.com/hashicorp/nomad/client/dynamicplugins" - "github.com/hashicorp/nomad/client/fingerprint" - "github.com/hashicorp/nomad/client/hoststats" - hvm "github.com/hashicorp/nomad/client/hostvolumemanager" - cinterfaces "github.com/hashicorp/nomad/client/interfaces" - "github.com/hashicorp/nomad/client/lib/cgroupslib" - "github.com/hashicorp/nomad/client/lib/numalib" - "github.com/hashicorp/nomad/client/lib/proclib" - "github.com/hashicorp/nomad/client/pluginmanager" - "github.com/hashicorp/nomad/client/pluginmanager/csimanager" - "github.com/hashicorp/nomad/client/pluginmanager/drivermanager" - "github.com/hashicorp/nomad/client/servers" - "github.com/hashicorp/nomad/client/serviceregistration" - "github.com/hashicorp/nomad/client/serviceregistration/checks/checkstore" - "github.com/hashicorp/nomad/client/serviceregistration/nsd" - "github.com/hashicorp/nomad/client/serviceregistration/wrapper" - "github.com/hashicorp/nomad/client/state" - cstructs "github.com/hashicorp/nomad/client/structs" - "github.com/hashicorp/nomad/client/vaultclient" - "github.com/hashicorp/nomad/client/widmgr" - "github.com/hashicorp/nomad/command/agent/consul" - "github.com/hashicorp/nomad/helper" - "github.com/hashicorp/nomad/helper/envoy" - "github.com/hashicorp/nomad/helper/escapingfs" - "github.com/hashicorp/nomad/helper/goruntime" - "github.com/hashicorp/nomad/helper/group" - "github.com/hashicorp/nomad/helper/pool" - "github.com/hashicorp/nomad/helper/tlsutil" - "github.com/hashicorp/nomad/helper/users/dynamic" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/lib/lang" - "github.com/hashicorp/nomad/nomad/structs" - nconfig "github.com/hashicorp/nomad/nomad/structs/config" - "github.com/hashicorp/nomad/plugins/csi" - "github.com/hashicorp/nomad/plugins/device" + "github.com/hashicorp/nomad/v2/client/allocdir" + "github.com/hashicorp/nomad/v2/client/allocrunner" + "github.com/hashicorp/nomad/v2/client/allocrunner/interfaces" + arstate "github.com/hashicorp/nomad/v2/client/allocrunner/state" + "github.com/hashicorp/nomad/v2/client/allocrunner/taskrunner/getter" + "github.com/hashicorp/nomad/v2/client/allocwatcher" + "github.com/hashicorp/nomad/v2/client/config" + consulApiShim "github.com/hashicorp/nomad/v2/client/consul" + "github.com/hashicorp/nomad/v2/client/devicemanager" + "github.com/hashicorp/nomad/v2/client/dynamicplugins" + "github.com/hashicorp/nomad/v2/client/fingerprint" + "github.com/hashicorp/nomad/v2/client/hoststats" + hvm "github.com/hashicorp/nomad/v2/client/hostvolumemanager" + cinterfaces "github.com/hashicorp/nomad/v2/client/interfaces" + "github.com/hashicorp/nomad/v2/client/lib/cgroupslib" + "github.com/hashicorp/nomad/v2/client/lib/numalib" + "github.com/hashicorp/nomad/v2/client/lib/proclib" + "github.com/hashicorp/nomad/v2/client/pluginmanager" + "github.com/hashicorp/nomad/v2/client/pluginmanager/csimanager" + "github.com/hashicorp/nomad/v2/client/pluginmanager/drivermanager" + "github.com/hashicorp/nomad/v2/client/servers" + "github.com/hashicorp/nomad/v2/client/serviceregistration" + "github.com/hashicorp/nomad/v2/client/serviceregistration/checks/checkstore" + "github.com/hashicorp/nomad/v2/client/serviceregistration/nsd" + "github.com/hashicorp/nomad/v2/client/serviceregistration/wrapper" + "github.com/hashicorp/nomad/v2/client/state" + cstructs "github.com/hashicorp/nomad/v2/client/structs" + "github.com/hashicorp/nomad/v2/client/vaultclient" + "github.com/hashicorp/nomad/v2/client/widmgr" + "github.com/hashicorp/nomad/v2/command/agent/consul" + "github.com/hashicorp/nomad/v2/helper" + "github.com/hashicorp/nomad/v2/helper/envoy" + "github.com/hashicorp/nomad/v2/helper/escapingfs" + "github.com/hashicorp/nomad/v2/helper/goruntime" + "github.com/hashicorp/nomad/v2/helper/group" + "github.com/hashicorp/nomad/v2/helper/pool" + "github.com/hashicorp/nomad/v2/helper/tlsutil" + "github.com/hashicorp/nomad/v2/helper/users/dynamic" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/lib/lang" + "github.com/hashicorp/nomad/v2/nomad/structs" + nconfig "github.com/hashicorp/nomad/v2/nomad/structs/config" + "github.com/hashicorp/nomad/v2/plugins/csi" + "github.com/hashicorp/nomad/v2/plugins/device" "github.com/shirou/gopsutil/v3/host" ) diff --git a/client/client_interface_test.go b/client/client_interface_test.go index 0d63877e084..fdf1d9c6201 100644 --- a/client/client_interface_test.go +++ b/client/client_interface_test.go @@ -7,19 +7,19 @@ import ( "sync" "testing" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/client/allocdir" - "github.com/hashicorp/nomad/client/allocrunner/interfaces" - "github.com/hashicorp/nomad/client/allocrunner/state" - "github.com/hashicorp/nomad/client/config" - cinterfaces "github.com/hashicorp/nomad/client/interfaces" - "github.com/hashicorp/nomad/client/pluginmanager/drivermanager" - cstructs "github.com/hashicorp/nomad/client/structs" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/plugins/device" - "github.com/hashicorp/nomad/plugins/drivers" - "github.com/hashicorp/nomad/testutil" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/client/allocdir" + "github.com/hashicorp/nomad/v2/client/allocrunner/interfaces" + "github.com/hashicorp/nomad/v2/client/allocrunner/state" + "github.com/hashicorp/nomad/v2/client/config" + cinterfaces "github.com/hashicorp/nomad/v2/client/interfaces" + "github.com/hashicorp/nomad/v2/client/pluginmanager/drivermanager" + cstructs "github.com/hashicorp/nomad/v2/client/structs" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/plugins/device" + "github.com/hashicorp/nomad/v2/plugins/drivers" + "github.com/hashicorp/nomad/v2/testutil" ) // TestEmptyAllocRunner demonstrates the minimum interface necessary to diff --git a/client/client_stats_endpoint.go b/client/client_stats_endpoint.go index 6db959088d6..83ca8f31272 100644 --- a/client/client_stats_endpoint.go +++ b/client/client_stats_endpoint.go @@ -7,8 +7,8 @@ import ( "time" metrics "github.com/hashicorp/go-metrics/compat" - "github.com/hashicorp/nomad/client/structs" - nstructs "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/client/structs" + nstructs "github.com/hashicorp/nomad/v2/nomad/structs" ) // ClientStats endpoint is used for retrieving stats about a client diff --git a/client/client_stats_endpoint_test.go b/client/client_stats_endpoint_test.go index 21c493dd6db..c3046bd74ae 100644 --- a/client/client_stats_endpoint_test.go +++ b/client/client_stats_endpoint_test.go @@ -6,12 +6,12 @@ package client import ( "testing" - "github.com/hashicorp/nomad/acl" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/client/config" - "github.com/hashicorp/nomad/client/structs" - "github.com/hashicorp/nomad/nomad/mock" - nstructs "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/acl" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/client/config" + "github.com/hashicorp/nomad/v2/client/structs" + "github.com/hashicorp/nomad/v2/nomad/mock" + nstructs "github.com/hashicorp/nomad/v2/nomad/structs" "github.com/stretchr/testify/require" ) diff --git a/client/client_test.go b/client/client_test.go index ec27a672581..67e45f95a05 100644 --- a/client/client_test.go +++ b/client/client_test.go @@ -17,30 +17,30 @@ import ( hclog "github.com/hashicorp/go-hclog" memdb "github.com/hashicorp/go-memdb" metrics "github.com/hashicorp/go-metrics/compat" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/client/allocrunner" - "github.com/hashicorp/nomad/client/allocrunner/interfaces" - trstate "github.com/hashicorp/nomad/client/allocrunner/taskrunner/state" - "github.com/hashicorp/nomad/client/config" - "github.com/hashicorp/nomad/client/fingerprint" - "github.com/hashicorp/nomad/client/servers" - regMock "github.com/hashicorp/nomad/client/serviceregistration/mock" - "github.com/hashicorp/nomad/client/state" - cstate "github.com/hashicorp/nomad/client/state" - cstructs "github.com/hashicorp/nomad/client/structs" - ctestutil "github.com/hashicorp/nomad/client/testutil" - "github.com/hashicorp/nomad/command/agent/consul" - "github.com/hashicorp/nomad/helper/pluginutils/catalog" - "github.com/hashicorp/nomad/helper/pluginutils/singleton" - "github.com/hashicorp/nomad/helper/testlog" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/nomad" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" - nconfig "github.com/hashicorp/nomad/nomad/structs/config" - "github.com/hashicorp/nomad/plugins/device" - psstructs "github.com/hashicorp/nomad/plugins/shared/structs" - "github.com/hashicorp/nomad/testutil" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/client/allocrunner" + "github.com/hashicorp/nomad/v2/client/allocrunner/interfaces" + trstate "github.com/hashicorp/nomad/v2/client/allocrunner/taskrunner/state" + "github.com/hashicorp/nomad/v2/client/config" + "github.com/hashicorp/nomad/v2/client/fingerprint" + "github.com/hashicorp/nomad/v2/client/servers" + regMock "github.com/hashicorp/nomad/v2/client/serviceregistration/mock" + "github.com/hashicorp/nomad/v2/client/state" + cstate "github.com/hashicorp/nomad/v2/client/state" + cstructs "github.com/hashicorp/nomad/v2/client/structs" + ctestutil "github.com/hashicorp/nomad/v2/client/testutil" + "github.com/hashicorp/nomad/v2/command/agent/consul" + "github.com/hashicorp/nomad/v2/helper/pluginutils/catalog" + "github.com/hashicorp/nomad/v2/helper/pluginutils/singleton" + "github.com/hashicorp/nomad/v2/helper/testlog" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/nomad" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" + nconfig "github.com/hashicorp/nomad/v2/nomad/structs/config" + "github.com/hashicorp/nomad/v2/plugins/device" + psstructs "github.com/hashicorp/nomad/v2/plugins/shared/structs" + "github.com/hashicorp/nomad/v2/testutil" "github.com/shoenig/test" "github.com/shoenig/test/must" "github.com/shoenig/test/wait" diff --git a/client/commonplugins/secrets_plugin.go b/client/commonplugins/secrets_plugin.go index bec5798aff1..b8d6012e6dd 100644 --- a/client/commonplugins/secrets_plugin.go +++ b/client/commonplugins/secrets_plugin.go @@ -14,7 +14,7 @@ import ( "time" log "github.com/hashicorp/go-hclog" - "github.com/hashicorp/nomad/helper" + "github.com/hashicorp/nomad/v2/helper" ) const ( diff --git a/client/commonplugins/secrets_plugin_test.go b/client/commonplugins/secrets_plugin_test.go index 0e58328043f..1550b5c9202 100644 --- a/client/commonplugins/secrets_plugin_test.go +++ b/client/commonplugins/secrets_plugin_test.go @@ -11,7 +11,7 @@ import ( "testing" "time" - "github.com/hashicorp/nomad/ci" + "github.com/hashicorp/nomad/v2/ci" "github.com/shoenig/test/must" ) diff --git a/client/config/arconfig.go b/client/config/arconfig.go index e292fb46e32..1bcc6d2cb5f 100644 --- a/client/config/arconfig.go +++ b/client/config/arconfig.go @@ -8,22 +8,22 @@ import ( log "github.com/hashicorp/go-hclog" metrics "github.com/hashicorp/go-metrics/compat" - "github.com/hashicorp/nomad/client/allocdir" - arinterfaces "github.com/hashicorp/nomad/client/allocrunner/interfaces" - "github.com/hashicorp/nomad/client/consul" - "github.com/hashicorp/nomad/client/devicemanager" - "github.com/hashicorp/nomad/client/dynamicplugins" - "github.com/hashicorp/nomad/client/interfaces" - "github.com/hashicorp/nomad/client/pluginmanager/csimanager" - "github.com/hashicorp/nomad/client/pluginmanager/drivermanager" - "github.com/hashicorp/nomad/client/serviceregistration" - "github.com/hashicorp/nomad/client/serviceregistration/checks/checkstore" - "github.com/hashicorp/nomad/client/serviceregistration/wrapper" - cstate "github.com/hashicorp/nomad/client/state" - "github.com/hashicorp/nomad/client/vaultclient" - "github.com/hashicorp/nomad/client/widmgr" - "github.com/hashicorp/nomad/helper/users/dynamic" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/client/allocdir" + arinterfaces "github.com/hashicorp/nomad/v2/client/allocrunner/interfaces" + "github.com/hashicorp/nomad/v2/client/consul" + "github.com/hashicorp/nomad/v2/client/devicemanager" + "github.com/hashicorp/nomad/v2/client/dynamicplugins" + "github.com/hashicorp/nomad/v2/client/interfaces" + "github.com/hashicorp/nomad/v2/client/pluginmanager/csimanager" + "github.com/hashicorp/nomad/v2/client/pluginmanager/drivermanager" + "github.com/hashicorp/nomad/v2/client/serviceregistration" + "github.com/hashicorp/nomad/v2/client/serviceregistration/checks/checkstore" + "github.com/hashicorp/nomad/v2/client/serviceregistration/wrapper" + cstate "github.com/hashicorp/nomad/v2/client/state" + "github.com/hashicorp/nomad/v2/client/vaultclient" + "github.com/hashicorp/nomad/v2/client/widmgr" + "github.com/hashicorp/nomad/v2/helper/users/dynamic" + "github.com/hashicorp/nomad/v2/nomad/structs" ) // AllocRunnerFactory returns an AllocRunner interface built from the diff --git a/client/config/artifact.go b/client/config/artifact.go index 2353e72c144..93e9bb1f8ca 100644 --- a/client/config/artifact.go +++ b/client/config/artifact.go @@ -9,7 +9,7 @@ import ( "time" "github.com/dustin/go-humanize" - "github.com/hashicorp/nomad/nomad/structs/config" + "github.com/hashicorp/nomad/v2/nomad/structs/config" ) // ArtifactConfig is the internal readonly copy of the client agent's diff --git a/client/config/artifact_test.go b/client/config/artifact_test.go index 21511407956..e712daaa05c 100644 --- a/client/config/artifact_test.go +++ b/client/config/artifact_test.go @@ -7,8 +7,8 @@ import ( "testing" "time" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/nomad/structs/config" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/nomad/structs/config" "github.com/shoenig/test/must" ) diff --git a/client/config/config.go b/client/config/config.go index 8fa2be1794c..be0fb033860 100644 --- a/client/config/config.go +++ b/client/config/config.go @@ -17,19 +17,19 @@ import ( "github.com/hashicorp/consul-template/config" log "github.com/hashicorp/go-hclog" - "github.com/hashicorp/nomad/client/allocrunner/interfaces" - "github.com/hashicorp/nomad/client/lib/numalib" - "github.com/hashicorp/nomad/client/lib/numalib/hw" - "github.com/hashicorp/nomad/client/state" - "github.com/hashicorp/nomad/command/agent/host" - "github.com/hashicorp/nomad/helper" - "github.com/hashicorp/nomad/helper/bufconndialer" - "github.com/hashicorp/nomad/helper/pluginutils/loader" - "github.com/hashicorp/nomad/helper/pointer" - "github.com/hashicorp/nomad/nomad/structs" - structsc "github.com/hashicorp/nomad/nomad/structs/config" - "github.com/hashicorp/nomad/plugins/base" - "github.com/hashicorp/nomad/version" + "github.com/hashicorp/nomad/v2/client/allocrunner/interfaces" + "github.com/hashicorp/nomad/v2/client/lib/numalib" + "github.com/hashicorp/nomad/v2/client/lib/numalib/hw" + "github.com/hashicorp/nomad/v2/client/state" + "github.com/hashicorp/nomad/v2/command/agent/host" + "github.com/hashicorp/nomad/v2/helper" + "github.com/hashicorp/nomad/v2/helper/bufconndialer" + "github.com/hashicorp/nomad/v2/helper/pluginutils/loader" + "github.com/hashicorp/nomad/v2/helper/pointer" + "github.com/hashicorp/nomad/v2/nomad/structs" + structsc "github.com/hashicorp/nomad/v2/nomad/structs/config" + "github.com/hashicorp/nomad/v2/plugins/base" + "github.com/hashicorp/nomad/v2/version" "github.com/hashicorp/yamux" ) diff --git a/client/config/config_ce.go b/client/config/config_ce.go index b2fcfa985bf..220352154c6 100644 --- a/client/config/config_ce.go +++ b/client/config/config_ce.go @@ -7,7 +7,7 @@ package config import ( "github.com/hashicorp/go-hclog" - structsc "github.com/hashicorp/nomad/nomad/structs/config" + structsc "github.com/hashicorp/nomad/v2/nomad/structs/config" ) // GetVaultConfigs returns the set of Vault configurations available for this diff --git a/client/config/config_test.go b/client/config/config_test.go index c9629a99226..ba2a7245d80 100644 --- a/client/config/config_test.go +++ b/client/config/config_test.go @@ -8,7 +8,7 @@ import ( "time" "github.com/hashicorp/consul-template/config" - "github.com/hashicorp/nomad/ci" + "github.com/hashicorp/nomad/v2/ci" "github.com/shoenig/test/must" ) diff --git a/client/config/drain.go b/client/config/drain.go index f46ebc92368..7f832218dc0 100644 --- a/client/config/drain.go +++ b/client/config/drain.go @@ -7,7 +7,7 @@ import ( "fmt" "time" - "github.com/hashicorp/nomad/nomad/structs/config" + "github.com/hashicorp/nomad/v2/nomad/structs/config" ) // DrainConfig describes a Node's drain behavior on graceful shutdown. diff --git a/client/config/fingerprint_test.go b/client/config/fingerprint_test.go index 1b362d13989..359780ff796 100644 --- a/client/config/fingerprint_test.go +++ b/client/config/fingerprint_test.go @@ -7,7 +7,7 @@ import ( "testing" "time" - "github.com/hashicorp/nomad/ci" + "github.com/hashicorp/nomad/v2/ci" "github.com/shoenig/test/must" ) diff --git a/client/config/testing.go b/client/config/testing.go index 43a6409c09e..a5978ab40e1 100644 --- a/client/config/testing.go +++ b/client/config/testing.go @@ -11,9 +11,9 @@ import ( "testing" "time" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/helper/testlog" - "github.com/hashicorp/nomad/nomad/mock" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/helper/testlog" + "github.com/hashicorp/nomad/v2/nomad/mock" ) // TestClientConfig returns a default client configuration for test clients and diff --git a/client/config/users.go b/client/config/users.go index 05633eb2e87..9e0f79dae65 100644 --- a/client/config/users.go +++ b/client/config/users.go @@ -3,7 +3,7 @@ package config -import sconfig "github.com/hashicorp/nomad/nomad/structs/config" +import sconfig "github.com/hashicorp/nomad/v2/nomad/structs/config" // UsersConfig configures things related to operating system users. type UsersConfig struct { diff --git a/client/config/users_test.go b/client/config/users_test.go index e7a09632452..f901164e0ec 100644 --- a/client/config/users_test.go +++ b/client/config/users_test.go @@ -6,8 +6,8 @@ package config import ( "testing" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/nomad/structs/config" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/nomad/structs/config" "github.com/shoenig/test/must" ) diff --git a/client/consul/consul.go b/client/consul/consul.go index 6234ac3acf3..fc544068541 100644 --- a/client/consul/consul.go +++ b/client/consul/consul.go @@ -11,10 +11,10 @@ import ( consulapi "github.com/hashicorp/consul/api" "github.com/hashicorp/go-hclog" "github.com/hashicorp/go-multierror" - "github.com/hashicorp/nomad/helper" - "github.com/hashicorp/nomad/helper/useragent" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/nomad/structs/config" + "github.com/hashicorp/nomad/v2/helper" + "github.com/hashicorp/nomad/v2/helper/useragent" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/nomad/structs/config" ) // SupportedProxiesAPI is the interface the Nomad Client uses to request from diff --git a/client/consul/consul_test.go b/client/consul/consul_test.go index 64e436cb46b..f509b87fd7c 100644 --- a/client/consul/consul_test.go +++ b/client/consul/consul_test.go @@ -14,11 +14,11 @@ import ( "time" consulapi "github.com/hashicorp/consul/api" - "github.com/hashicorp/nomad/helper/testlog" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/nomad/structs/config" + "github.com/hashicorp/nomad/v2/helper/testlog" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/nomad/structs/config" "github.com/shoenig/test/must" ) diff --git a/client/consul/consul_testing.go b/client/consul/consul_testing.go index 51876d142b7..7d23e5857e8 100644 --- a/client/consul/consul_testing.go +++ b/client/consul/consul_testing.go @@ -10,7 +10,7 @@ import ( consulapi "github.com/hashicorp/consul/api" "github.com/hashicorp/go-hclog" - "github.com/hashicorp/nomad/nomad/structs/config" + "github.com/hashicorp/nomad/v2/nomad/structs/config" ) type MockConsulClient struct { diff --git a/client/csi_endpoint.go b/client/csi_endpoint.go index c4640d84622..6c59af0d2bf 100644 --- a/client/csi_endpoint.go +++ b/client/csi_endpoint.go @@ -12,11 +12,11 @@ import ( grpc_retry "github.com/grpc-ecosystem/go-grpc-middleware/retry" metrics "github.com/hashicorp/go-metrics/compat" - "github.com/hashicorp/nomad/client/dynamicplugins" - "github.com/hashicorp/nomad/client/pluginmanager/csimanager" - "github.com/hashicorp/nomad/client/structs" - nstructs "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/plugins/csi" + "github.com/hashicorp/nomad/v2/client/dynamicplugins" + "github.com/hashicorp/nomad/v2/client/pluginmanager/csimanager" + "github.com/hashicorp/nomad/v2/client/structs" + nstructs "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/plugins/csi" ) // CSI endpoint is used for interacting with CSI plugins on a client. diff --git a/client/csi_endpoint_test.go b/client/csi_endpoint_test.go index 9aed05036f6..dcb7fde6b02 100644 --- a/client/csi_endpoint_test.go +++ b/client/csi_endpoint_test.go @@ -12,13 +12,13 @@ import ( "github.com/shoenig/test/must" "github.com/stretchr/testify/require" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/client/dynamicplugins" - "github.com/hashicorp/nomad/client/pluginmanager/csimanager" - "github.com/hashicorp/nomad/client/structs" - nstructs "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/plugins/csi" - "github.com/hashicorp/nomad/plugins/csi/fake" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/client/dynamicplugins" + "github.com/hashicorp/nomad/v2/client/pluginmanager/csimanager" + "github.com/hashicorp/nomad/v2/client/structs" + nstructs "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/plugins/csi" + "github.com/hashicorp/nomad/v2/plugins/csi/fake" ) var fakePlugin = &dynamicplugins.PluginInfo{ diff --git a/client/devicemanager/instance.go b/client/devicemanager/instance.go index e49d015a932..e77232ab8c7 100644 --- a/client/devicemanager/instance.go +++ b/client/devicemanager/instance.go @@ -11,13 +11,13 @@ import ( log "github.com/hashicorp/go-hclog" multierror "github.com/hashicorp/go-multierror" - "github.com/hashicorp/nomad/helper" - "github.com/hashicorp/nomad/helper/pluginutils/loader" - "github.com/hashicorp/nomad/helper/pluginutils/singleton" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/plugins/base" - bstructs "github.com/hashicorp/nomad/plugins/base/structs" - "github.com/hashicorp/nomad/plugins/device" + "github.com/hashicorp/nomad/v2/helper" + "github.com/hashicorp/nomad/v2/helper/pluginutils/loader" + "github.com/hashicorp/nomad/v2/helper/pluginutils/singleton" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/plugins/base" + bstructs "github.com/hashicorp/nomad/v2/plugins/base/structs" + "github.com/hashicorp/nomad/v2/plugins/device" ) const ( diff --git a/client/devicemanager/manager.go b/client/devicemanager/manager.go index a620d497768..1ea5bb35b6c 100644 --- a/client/devicemanager/manager.go +++ b/client/devicemanager/manager.go @@ -13,13 +13,13 @@ import ( log "github.com/hashicorp/go-hclog" multierror "github.com/hashicorp/go-multierror" plugin "github.com/hashicorp/go-plugin" - "github.com/hashicorp/nomad/client/devicemanager/state" - "github.com/hashicorp/nomad/client/pluginmanager" - "github.com/hashicorp/nomad/helper/pluginutils/loader" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/plugins/base" - "github.com/hashicorp/nomad/plugins/device" - pstructs "github.com/hashicorp/nomad/plugins/shared/structs" + "github.com/hashicorp/nomad/v2/client/devicemanager/state" + "github.com/hashicorp/nomad/v2/client/pluginmanager" + "github.com/hashicorp/nomad/v2/helper/pluginutils/loader" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/plugins/base" + "github.com/hashicorp/nomad/v2/plugins/device" + pstructs "github.com/hashicorp/nomad/v2/plugins/shared/structs" ) // Manager is the interface used to manage device plugins diff --git a/client/devicemanager/manager_test.go b/client/devicemanager/manager_test.go index e8eb84043e9..f126cc58fb9 100644 --- a/client/devicemanager/manager_test.go +++ b/client/devicemanager/manager_test.go @@ -12,16 +12,16 @@ import ( log "github.com/hashicorp/go-hclog" plugin "github.com/hashicorp/go-plugin" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/client/state" - "github.com/hashicorp/nomad/helper/pluginutils/loader" - "github.com/hashicorp/nomad/helper/testlog" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/plugins/base" - "github.com/hashicorp/nomad/plugins/device" - psstructs "github.com/hashicorp/nomad/plugins/shared/structs" - "github.com/hashicorp/nomad/testutil" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/client/state" + "github.com/hashicorp/nomad/v2/helper/pluginutils/loader" + "github.com/hashicorp/nomad/v2/helper/testlog" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/plugins/base" + "github.com/hashicorp/nomad/v2/plugins/device" + psstructs "github.com/hashicorp/nomad/v2/plugins/shared/structs" + "github.com/hashicorp/nomad/v2/testutil" "github.com/stretchr/testify/require" ) diff --git a/client/devicemanager/state/state.go b/client/devicemanager/state/state.go index 4079e7bd5c6..6e3bc6ea647 100644 --- a/client/devicemanager/state/state.go +++ b/client/devicemanager/state/state.go @@ -3,7 +3,7 @@ package state -import pstructs "github.com/hashicorp/nomad/plugins/shared/structs" +import pstructs "github.com/hashicorp/nomad/v2/plugins/shared/structs" // PluginState is used to store the device manager's state across restarts of the // agent diff --git a/client/devicemanager/testing.go b/client/devicemanager/testing.go index ce3a1da436b..cc6f7540e3a 100644 --- a/client/devicemanager/testing.go +++ b/client/devicemanager/testing.go @@ -4,9 +4,9 @@ package devicemanager import ( - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/plugins/base" - "github.com/hashicorp/nomad/plugins/device" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/plugins/base" + "github.com/hashicorp/nomad/v2/plugins/device" ) type ReserveFn func(d *structs.AllocatedDeviceResource) (*device.ContainerReservation, error) diff --git a/client/devicemanager/utils.go b/client/devicemanager/utils.go index 12e5ab5c1e1..49ec2d60151 100644 --- a/client/devicemanager/utils.go +++ b/client/devicemanager/utils.go @@ -7,9 +7,9 @@ import ( "errors" "fmt" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/plugins/device" - psstructs "github.com/hashicorp/nomad/plugins/shared/structs" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/plugins/device" + psstructs "github.com/hashicorp/nomad/v2/plugins/shared/structs" ) // UnknownDeviceError is returned when an operation is attempted on an unknown diff --git a/client/drain.go b/client/drain.go index a4fe9690de6..b96806155b5 100644 --- a/client/drain.go +++ b/client/drain.go @@ -8,9 +8,9 @@ import ( "fmt" "time" - "github.com/hashicorp/nomad/client/config" - "github.com/hashicorp/nomad/helper" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/client/config" + "github.com/hashicorp/nomad/v2/helper" + "github.com/hashicorp/nomad/v2/nomad/structs" ) func (c *Client) DrainSelf() error { diff --git a/client/drain_test.go b/client/drain_test.go index f661ea8a700..f8fecd1c5b0 100644 --- a/client/drain_test.go +++ b/client/drain_test.go @@ -11,14 +11,14 @@ import ( "github.com/shoenig/test/must" "github.com/shoenig/test/wait" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/client/config" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/nomad" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" - nstructs "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/testutil" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/client/config" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/nomad" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" + nstructs "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/testutil" ) // TestClient_SelfDrainConfig is an integration test of the client's Leave diff --git a/client/driver_manager_test.go b/client/driver_manager_test.go index bd8cad71379..c61aba9a050 100644 --- a/client/driver_manager_test.go +++ b/client/driver_manager_test.go @@ -8,13 +8,13 @@ import ( "testing" "time" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/client/config" - "github.com/hashicorp/nomad/client/lib/numalib" - "github.com/hashicorp/nomad/client/pluginmanager/drivermanager" - "github.com/hashicorp/nomad/helper/pluginutils/catalog" - nconfig "github.com/hashicorp/nomad/nomad/structs/config" - "github.com/hashicorp/nomad/testutil" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/client/config" + "github.com/hashicorp/nomad/v2/client/lib/numalib" + "github.com/hashicorp/nomad/v2/client/pluginmanager/drivermanager" + "github.com/hashicorp/nomad/v2/helper/pluginutils/catalog" + nconfig "github.com/hashicorp/nomad/v2/nomad/structs/config" + "github.com/hashicorp/nomad/v2/testutil" "github.com/stretchr/testify/require" ) diff --git a/client/dynamicplugins/registry.go b/client/dynamicplugins/registry.go index c8770d5a2c6..d15847539aa 100644 --- a/client/dynamicplugins/registry.go +++ b/client/dynamicplugins/registry.go @@ -14,7 +14,7 @@ import ( "sync" "time" - "github.com/hashicorp/nomad/helper" + "github.com/hashicorp/nomad/v2/helper" ) const ( diff --git a/client/dynamicplugins/registry_test.go b/client/dynamicplugins/registry_test.go index eb7cedfc59b..87854d03f1a 100644 --- a/client/dynamicplugins/registry_test.go +++ b/client/dynamicplugins/registry_test.go @@ -10,7 +10,7 @@ import ( "testing" "time" - "github.com/hashicorp/nomad/ci" + "github.com/hashicorp/nomad/v2/ci" "github.com/stretchr/testify/require" ) diff --git a/client/fingerprint/arch_test.go b/client/fingerprint/arch_test.go index 7694201fa94..49505fe0afe 100644 --- a/client/fingerprint/arch_test.go +++ b/client/fingerprint/arch_test.go @@ -6,10 +6,10 @@ package fingerprint import ( "testing" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/client/config" - "github.com/hashicorp/nomad/helper/testlog" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/client/config" + "github.com/hashicorp/nomad/v2/helper/testlog" + "github.com/hashicorp/nomad/v2/nomad/structs" ) func TestArchFingerprint(t *testing.T) { diff --git a/client/fingerprint/bridge_linux.go b/client/fingerprint/bridge_linux.go index b531488da63..f71688ffbd1 100644 --- a/client/fingerprint/bridge_linux.go +++ b/client/fingerprint/bridge_linux.go @@ -13,7 +13,7 @@ import ( "strconv" "github.com/hashicorp/go-multierror" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/nomad/structs" "github.com/shirou/gopsutil/v3/host" ) diff --git a/client/fingerprint/bridge_linux_test.go b/client/fingerprint/bridge_linux_test.go index 40ee59ab447..fa707b95741 100644 --- a/client/fingerprint/bridge_linux_test.go +++ b/client/fingerprint/bridge_linux_test.go @@ -10,8 +10,8 @@ import ( "strings" "testing" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/helper/testlog" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/helper/testlog" "github.com/stretchr/testify/require" ) diff --git a/client/fingerprint/cgroup.go b/client/fingerprint/cgroup.go index f14d2df1248..6e9a92807e7 100644 --- a/client/fingerprint/cgroup.go +++ b/client/fingerprint/cgroup.go @@ -5,7 +5,7 @@ package fingerprint import ( "github.com/hashicorp/go-hclog" - "github.com/hashicorp/nomad/client/lib/cgroupslib" + "github.com/hashicorp/nomad/v2/client/lib/cgroupslib" ) type CgroupFingerprint struct { diff --git a/client/fingerprint/cni.go b/client/fingerprint/cni.go index 048ebdb48cd..20f17c1be5f 100644 --- a/client/fingerprint/cni.go +++ b/client/fingerprint/cni.go @@ -10,7 +10,7 @@ import ( "github.com/containernetworking/cni/libcni" "github.com/hashicorp/go-hclog" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/nomad/structs" ) // CNIFingerprint creates a fingerprint of the CNI configuration(s) on the diff --git a/client/fingerprint/cni_test.go b/client/fingerprint/cni_test.go index ae0b71b2cfe..45ea602abd3 100644 --- a/client/fingerprint/cni_test.go +++ b/client/fingerprint/cni_test.go @@ -6,10 +6,10 @@ package fingerprint import ( "testing" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/client/config" - "github.com/hashicorp/nomad/helper/testlog" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/client/config" + "github.com/hashicorp/nomad/v2/helper/testlog" + "github.com/hashicorp/nomad/v2/nomad/structs" "github.com/stretchr/testify/require" ) diff --git a/client/fingerprint/consul.go b/client/fingerprint/consul.go index 2f8436f3895..32b6be01d28 100644 --- a/client/fingerprint/consul.go +++ b/client/fingerprint/consul.go @@ -16,9 +16,9 @@ import ( "github.com/hashicorp/go-multierror" "github.com/hashicorp/go-sockaddr" "github.com/hashicorp/go-version" - agentconsul "github.com/hashicorp/nomad/command/agent/consul" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/nomad/structs/config" + agentconsul "github.com/hashicorp/nomad/v2/command/agent/consul" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/nomad/structs/config" ) var ( diff --git a/client/fingerprint/consul_test.go b/client/fingerprint/consul_test.go index 8e676939ede..9636a8232d1 100644 --- a/client/fingerprint/consul_test.go +++ b/client/fingerprint/consul_test.go @@ -11,11 +11,11 @@ import ( "strings" "testing" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/client/config" - agentconsul "github.com/hashicorp/nomad/command/agent/consul" - "github.com/hashicorp/nomad/helper/testlog" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/client/config" + agentconsul "github.com/hashicorp/nomad/v2/command/agent/consul" + "github.com/hashicorp/nomad/v2/helper/testlog" + "github.com/hashicorp/nomad/v2/nomad/structs" "github.com/shoenig/test/must" ) diff --git a/client/fingerprint/cpu.go b/client/fingerprint/cpu.go index ccf2ca119a8..3c9dc83bc68 100644 --- a/client/fingerprint/cpu.go +++ b/client/fingerprint/cpu.go @@ -10,10 +10,10 @@ import ( "strings" "github.com/hashicorp/go-hclog" - "github.com/hashicorp/nomad/client/lib/idset" - "github.com/hashicorp/nomad/client/lib/numalib" - "github.com/hashicorp/nomad/client/lib/numalib/hw" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/client/lib/idset" + "github.com/hashicorp/nomad/v2/client/lib/numalib" + "github.com/hashicorp/nomad/v2/client/lib/numalib/hw" + "github.com/hashicorp/nomad/v2/nomad/structs" "github.com/klauspost/cpuid/v2" ) diff --git a/client/fingerprint/cpu_darwin_test.go b/client/fingerprint/cpu_darwin_test.go index 73f940e5756..36f81dbefca 100644 --- a/client/fingerprint/cpu_darwin_test.go +++ b/client/fingerprint/cpu_darwin_test.go @@ -8,10 +8,10 @@ package fingerprint import ( "testing" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/client/config" - "github.com/hashicorp/nomad/helper/testlog" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/client/config" + "github.com/hashicorp/nomad/v2/helper/testlog" + "github.com/hashicorp/nomad/v2/nomad/structs" "github.com/shoenig/test/must" ) diff --git a/client/fingerprint/cpu_default_test.go b/client/fingerprint/cpu_default_test.go index f0e2142be7b..451ff70268c 100644 --- a/client/fingerprint/cpu_default_test.go +++ b/client/fingerprint/cpu_default_test.go @@ -10,12 +10,12 @@ import ( "strconv" "testing" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/client/config" - "github.com/hashicorp/nomad/client/lib/numalib/hw" - "github.com/hashicorp/nomad/client/testutil" - "github.com/hashicorp/nomad/helper/testlog" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/client/config" + "github.com/hashicorp/nomad/v2/client/lib/numalib/hw" + "github.com/hashicorp/nomad/v2/client/testutil" + "github.com/hashicorp/nomad/v2/helper/testlog" + "github.com/hashicorp/nomad/v2/nomad/structs" "github.com/shoenig/test/must" ) diff --git a/client/fingerprint/dynamic_host_volumes.go b/client/fingerprint/dynamic_host_volumes.go index a7b8f5cb17e..b5944bde539 100644 --- a/client/fingerprint/dynamic_host_volumes.go +++ b/client/fingerprint/dynamic_host_volumes.go @@ -11,8 +11,8 @@ import ( "time" "github.com/hashicorp/go-hclog" - hvm "github.com/hashicorp/nomad/client/hostvolumemanager" - "github.com/hashicorp/nomad/helper" + hvm "github.com/hashicorp/nomad/v2/client/hostvolumemanager" + "github.com/hashicorp/nomad/v2/helper" ) func NewPluginsHostVolumeFingerprint(logger hclog.Logger) Fingerprint { diff --git a/client/fingerprint/dynamic_host_volumes_test.go b/client/fingerprint/dynamic_host_volumes_test.go index 29267098c69..879ae4dbd05 100644 --- a/client/fingerprint/dynamic_host_volumes_test.go +++ b/client/fingerprint/dynamic_host_volumes_test.go @@ -9,10 +9,10 @@ import ( "runtime" "testing" - "github.com/hashicorp/nomad/client/config" - hvm "github.com/hashicorp/nomad/client/hostvolumemanager" - "github.com/hashicorp/nomad/helper/testlog" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/client/config" + hvm "github.com/hashicorp/nomad/v2/client/hostvolumemanager" + "github.com/hashicorp/nomad/v2/helper/testlog" + "github.com/hashicorp/nomad/v2/nomad/structs" "github.com/shoenig/test/must" ) diff --git a/client/fingerprint/env_aws.go b/client/fingerprint/env_aws.go index b65a3b9331c..09c021c3b8a 100644 --- a/client/fingerprint/env_aws.go +++ b/client/fingerprint/env_aws.go @@ -19,7 +19,7 @@ import ( "github.com/hashicorp/go-cleanhttp" log "github.com/hashicorp/go-hclog" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/nomad/structs" ) const ( diff --git a/client/fingerprint/env_aws_test.go b/client/fingerprint/env_aws_test.go index dad8076865b..339eccc87e1 100644 --- a/client/fingerprint/env_aws_test.go +++ b/client/fingerprint/env_aws_test.go @@ -11,10 +11,10 @@ import ( "github.com/aws/smithy-go" smithyHttp "github.com/aws/smithy-go/transport/http" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/client/config" - "github.com/hashicorp/nomad/helper/testlog" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/client/config" + "github.com/hashicorp/nomad/v2/helper/testlog" + "github.com/hashicorp/nomad/v2/nomad/structs" "github.com/shoenig/test/must" "github.com/stretchr/testify/require" ) diff --git a/client/fingerprint/env_azure.go b/client/fingerprint/env_azure.go index 329db1728d4..343435d6b96 100644 --- a/client/fingerprint/env_azure.go +++ b/client/fingerprint/env_azure.go @@ -16,8 +16,8 @@ import ( cleanhttp "github.com/hashicorp/go-cleanhttp" log "github.com/hashicorp/go-hclog" - "github.com/hashicorp/nomad/helper/useragent" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/helper/useragent" + "github.com/hashicorp/nomad/v2/nomad/structs" ) const ( diff --git a/client/fingerprint/env_azure_test.go b/client/fingerprint/env_azure_test.go index d580cdd0898..aea701ae366 100644 --- a/client/fingerprint/env_azure_test.go +++ b/client/fingerprint/env_azure_test.go @@ -11,10 +11,10 @@ import ( "strings" "testing" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/client/config" - "github.com/hashicorp/nomad/helper/testlog" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/client/config" + "github.com/hashicorp/nomad/v2/helper/testlog" + "github.com/hashicorp/nomad/v2/nomad/structs" "github.com/shoenig/test/must" ) diff --git a/client/fingerprint/env_digitalocean.go b/client/fingerprint/env_digitalocean.go index b5d3bdaf95b..c5cb1408f65 100644 --- a/client/fingerprint/env_digitalocean.go +++ b/client/fingerprint/env_digitalocean.go @@ -16,8 +16,8 @@ import ( cleanhttp "github.com/hashicorp/go-cleanhttp" log "github.com/hashicorp/go-hclog" - "github.com/hashicorp/nomad/helper/useragent" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/helper/useragent" + "github.com/hashicorp/nomad/v2/nomad/structs" ) const ( diff --git a/client/fingerprint/env_digitalocean_test.go b/client/fingerprint/env_digitalocean_test.go index c0ff9b7c2a2..eafd178a2f5 100644 --- a/client/fingerprint/env_digitalocean_test.go +++ b/client/fingerprint/env_digitalocean_test.go @@ -11,10 +11,10 @@ import ( "strings" "testing" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/client/config" - "github.com/hashicorp/nomad/helper/testlog" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/client/config" + "github.com/hashicorp/nomad/v2/helper/testlog" + "github.com/hashicorp/nomad/v2/nomad/structs" "github.com/shoenig/test/must" "github.com/stretchr/testify/assert" ) diff --git a/client/fingerprint/env_gce.go b/client/fingerprint/env_gce.go index ef96bcf6848..7ecd955ec98 100644 --- a/client/fingerprint/env_gce.go +++ b/client/fingerprint/env_gce.go @@ -18,8 +18,8 @@ import ( cleanhttp "github.com/hashicorp/go-cleanhttp" log "github.com/hashicorp/go-hclog" - "github.com/hashicorp/nomad/helper/useragent" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/helper/useragent" + "github.com/hashicorp/nomad/v2/nomad/structs" ) const ( diff --git a/client/fingerprint/env_gce_test.go b/client/fingerprint/env_gce_test.go index 01a7acee623..d3fcdbd6bb8 100644 --- a/client/fingerprint/env_gce_test.go +++ b/client/fingerprint/env_gce_test.go @@ -10,10 +10,10 @@ import ( "net/http/httptest" "testing" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/client/config" - "github.com/hashicorp/nomad/helper/testlog" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/client/config" + "github.com/hashicorp/nomad/v2/helper/testlog" + "github.com/hashicorp/nomad/v2/nomad/structs" "github.com/shoenig/test/must" ) diff --git a/client/fingerprint/fingerprint.go b/client/fingerprint/fingerprint.go index d431300ba3c..a07d80b197f 100644 --- a/client/fingerprint/fingerprint.go +++ b/client/fingerprint/fingerprint.go @@ -9,7 +9,7 @@ import ( "time" log "github.com/hashicorp/go-hclog" - cstructs "github.com/hashicorp/nomad/client/structs" + cstructs "github.com/hashicorp/nomad/v2/client/structs" ) // EmptyDuration is to be used by fingerprinters that are not periodic. diff --git a/client/fingerprint/fingerprint_retry.go b/client/fingerprint/fingerprint_retry.go index 59e9d04718e..3f265a34b66 100644 --- a/client/fingerprint/fingerprint_retry.go +++ b/client/fingerprint/fingerprint_retry.go @@ -10,7 +10,7 @@ import ( "github.com/hashicorp/go-hclog" - "github.com/hashicorp/nomad/client/config" + "github.com/hashicorp/nomad/v2/client/config" ) // RetryWrapper is a fingerprinter wrapper that adds retry logic to an existing diff --git a/client/fingerprint/fingerprint_retry_test.go b/client/fingerprint/fingerprint_retry_test.go index d902d04b6f7..0ff19a0c63a 100644 --- a/client/fingerprint/fingerprint_retry_test.go +++ b/client/fingerprint/fingerprint_retry_test.go @@ -9,10 +9,10 @@ import ( "testing" "time" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/client/config" - "github.com/hashicorp/nomad/helper/testlog" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/client/config" + "github.com/hashicorp/nomad/v2/helper/testlog" + "github.com/hashicorp/nomad/v2/nomad/structs" "github.com/shoenig/test/must" ) diff --git a/client/fingerprint/fingerprint_test.go b/client/fingerprint/fingerprint_test.go index b0833862b20..528334cc1ce 100644 --- a/client/fingerprint/fingerprint_test.go +++ b/client/fingerprint/fingerprint_test.go @@ -8,8 +8,8 @@ package fingerprint import ( "testing" - "github.com/hashicorp/nomad/client/config" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/client/config" + "github.com/hashicorp/nomad/v2/nomad/structs" "github.com/stretchr/testify/require" ) diff --git a/client/fingerprint/host_test.go b/client/fingerprint/host_test.go index e0cfb53f577..913f105285d 100644 --- a/client/fingerprint/host_test.go +++ b/client/fingerprint/host_test.go @@ -7,10 +7,10 @@ import ( "runtime" "testing" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/client/config" - "github.com/hashicorp/nomad/helper/testlog" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/client/config" + "github.com/hashicorp/nomad/v2/helper/testlog" + "github.com/hashicorp/nomad/v2/nomad/structs" ) func TestHostFingerprint(t *testing.T) { diff --git a/client/fingerprint/landlock_test.go b/client/fingerprint/landlock_test.go index 2a2386a77b1..5362982eb57 100644 --- a/client/fingerprint/landlock_test.go +++ b/client/fingerprint/landlock_test.go @@ -8,9 +8,9 @@ import ( "fmt" "testing" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/client/testutil" - "github.com/hashicorp/nomad/helper/testlog" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/client/testutil" + "github.com/hashicorp/nomad/v2/helper/testlog" "github.com/shoenig/go-landlock" "github.com/shoenig/test/must" ) diff --git a/client/fingerprint/memory.go b/client/fingerprint/memory.go index d9fae52428e..51b7bbf9258 100644 --- a/client/fingerprint/memory.go +++ b/client/fingerprint/memory.go @@ -7,7 +7,7 @@ import ( "fmt" log "github.com/hashicorp/go-hclog" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/nomad/structs" "github.com/shirou/gopsutil/v3/mem" ) diff --git a/client/fingerprint/memory_test.go b/client/fingerprint/memory_test.go index 6ff13ba13e4..48a7bb8455a 100644 --- a/client/fingerprint/memory_test.go +++ b/client/fingerprint/memory_test.go @@ -6,10 +6,10 @@ package fingerprint import ( "testing" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/client/config" - "github.com/hashicorp/nomad/helper/testlog" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/client/config" + "github.com/hashicorp/nomad/v2/helper/testlog" + "github.com/hashicorp/nomad/v2/nomad/structs" "github.com/shoenig/test/must" ) diff --git a/client/fingerprint/network.go b/client/fingerprint/network.go index 8c520cf60b8..ce477713d2b 100644 --- a/client/fingerprint/network.go +++ b/client/fingerprint/network.go @@ -12,8 +12,8 @@ import ( log "github.com/hashicorp/go-hclog" sockaddr "github.com/hashicorp/go-sockaddr" "github.com/hashicorp/go-sockaddr/template" - "github.com/hashicorp/nomad/client/config" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/client/config" + "github.com/hashicorp/nomad/v2/nomad/structs" ) const ( diff --git a/client/fingerprint/network_test.go b/client/fingerprint/network_test.go index 3450f7fc7c8..ee0c4cd9f5c 100644 --- a/client/fingerprint/network_test.go +++ b/client/fingerprint/network_test.go @@ -11,10 +11,10 @@ import ( "strings" "testing" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/client/config" - "github.com/hashicorp/nomad/helper/testlog" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/client/config" + "github.com/hashicorp/nomad/v2/helper/testlog" + "github.com/hashicorp/nomad/v2/nomad/structs" "github.com/stretchr/testify/require" ) diff --git a/client/fingerprint/nomad_test.go b/client/fingerprint/nomad_test.go index 35c4c0e79ef..b958b965674 100644 --- a/client/fingerprint/nomad_test.go +++ b/client/fingerprint/nomad_test.go @@ -6,11 +6,11 @@ package fingerprint import ( "testing" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/client/config" - "github.com/hashicorp/nomad/helper/testlog" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/version" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/client/config" + "github.com/hashicorp/nomad/v2/helper/testlog" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/version" "github.com/stretchr/testify/require" ) diff --git a/client/fingerprint/plugins_cni_test.go b/client/fingerprint/plugins_cni_test.go index fa6f42cb94e..418f499a3c6 100644 --- a/client/fingerprint/plugins_cni_test.go +++ b/client/fingerprint/plugins_cni_test.go @@ -7,9 +7,9 @@ import ( "os" "testing" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/client/config" - "github.com/hashicorp/nomad/helper/testlog" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/client/config" + "github.com/hashicorp/nomad/v2/helper/testlog" "github.com/shoenig/test/must" ) diff --git a/client/fingerprint/secrets.go b/client/fingerprint/secrets.go index d0b00c73b1e..cc80991055a 100644 --- a/client/fingerprint/secrets.go +++ b/client/fingerprint/secrets.go @@ -11,8 +11,8 @@ import ( "time" "github.com/hashicorp/go-hclog" - "github.com/hashicorp/nomad/client/commonplugins" - "github.com/hashicorp/nomad/helper" + "github.com/hashicorp/nomad/v2/client/commonplugins" + "github.com/hashicorp/nomad/v2/helper" ) type SecretsPluginFingerprint struct { diff --git a/client/fingerprint/secrets_test.go b/client/fingerprint/secrets_test.go index f65c9ef85be..f3d7114e81f 100644 --- a/client/fingerprint/secrets_test.go +++ b/client/fingerprint/secrets_test.go @@ -9,9 +9,9 @@ import ( "runtime" "testing" - "github.com/hashicorp/nomad/client/config" - "github.com/hashicorp/nomad/helper/testlog" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/client/config" + "github.com/hashicorp/nomad/v2/helper/testlog" + "github.com/hashicorp/nomad/v2/nomad/structs" "github.com/shoenig/test/must" ) diff --git a/client/fingerprint/signal_test.go b/client/fingerprint/signal_test.go index 7162b057794..a9a069a9545 100644 --- a/client/fingerprint/signal_test.go +++ b/client/fingerprint/signal_test.go @@ -6,9 +6,9 @@ package fingerprint import ( "testing" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/helper/testlog" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/helper/testlog" + "github.com/hashicorp/nomad/v2/nomad/structs" ) func TestSignalFingerprint(t *testing.T) { diff --git a/client/fingerprint/storage.go b/client/fingerprint/storage.go index 0cdc7529268..0dc7d0f698c 100644 --- a/client/fingerprint/storage.go +++ b/client/fingerprint/storage.go @@ -9,7 +9,7 @@ import ( "strconv" log "github.com/hashicorp/go-hclog" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/nomad/structs" ) const bytesPerMegabyte = 1024 * 1024 diff --git a/client/fingerprint/storage_test.go b/client/fingerprint/storage_test.go index 4247883936f..904020c4da9 100644 --- a/client/fingerprint/storage_test.go +++ b/client/fingerprint/storage_test.go @@ -7,9 +7,9 @@ import ( "strconv" "testing" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/helper/testlog" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/helper/testlog" + "github.com/hashicorp/nomad/v2/nomad/structs" ) func TestStorageFingerprint(t *testing.T) { diff --git a/client/fingerprint/structs.go b/client/fingerprint/structs.go index 79b5ace2fd5..ab5374580c7 100644 --- a/client/fingerprint/structs.go +++ b/client/fingerprint/structs.go @@ -4,9 +4,9 @@ package fingerprint import ( - "github.com/hashicorp/nomad/client/config" - "github.com/hashicorp/nomad/client/lib/numalib" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/client/config" + "github.com/hashicorp/nomad/v2/client/lib/numalib" + "github.com/hashicorp/nomad/v2/nomad/structs" ) // FingerprintRequest is a request which a fingerprinter accepts to fingerprint diff --git a/client/fingerprint/vault.go b/client/fingerprint/vault.go index ad5f309d7f5..8cb8c6d1b2f 100644 --- a/client/fingerprint/vault.go +++ b/client/fingerprint/vault.go @@ -12,9 +12,9 @@ import ( log "github.com/hashicorp/go-hclog" "github.com/hashicorp/go-multierror" - "github.com/hashicorp/nomad/helper/useragent" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/nomad/structs/config" + "github.com/hashicorp/nomad/v2/helper/useragent" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/nomad/structs/config" vapi "github.com/hashicorp/vault/api" ) diff --git a/client/fingerprint/vault_test.go b/client/fingerprint/vault_test.go index df57c6006c9..8e176cb52d8 100644 --- a/client/fingerprint/vault_test.go +++ b/client/fingerprint/vault_test.go @@ -6,11 +6,11 @@ package fingerprint import ( "testing" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/client/config" - "github.com/hashicorp/nomad/helper/testlog" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/testutil" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/client/config" + "github.com/hashicorp/nomad/v2/helper/testlog" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/testutil" "github.com/shoenig/test/must" ) diff --git a/client/fingerprint_manager.go b/client/fingerprint_manager.go index 5ec7c080c75..f23f2de4e1f 100644 --- a/client/fingerprint_manager.go +++ b/client/fingerprint_manager.go @@ -8,10 +8,10 @@ import ( "time" log "github.com/hashicorp/go-hclog" - "github.com/hashicorp/nomad/client/config" - "github.com/hashicorp/nomad/client/fingerprint" - "github.com/hashicorp/nomad/helper/pluginutils/loader" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/client/config" + "github.com/hashicorp/nomad/v2/client/fingerprint" + "github.com/hashicorp/nomad/v2/helper/pluginutils/loader" + "github.com/hashicorp/nomad/v2/nomad/structs" ) // FingerprintManager runs a client fingerprinters on a continuous basis, and diff --git a/client/fingerprint_manager_test.go b/client/fingerprint_manager_test.go index d1bf4ede995..cb105a8963a 100644 --- a/client/fingerprint_manager_test.go +++ b/client/fingerprint_manager_test.go @@ -6,8 +6,8 @@ package client import ( "testing" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/client/config" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/client/config" "github.com/shoenig/test/must" ) diff --git a/client/fs_endpoint.go b/client/fs_endpoint.go index 8f3c8e67fee..683c51a5f08 100644 --- a/client/fs_endpoint.go +++ b/client/fs_endpoint.go @@ -22,11 +22,11 @@ import ( "github.com/hashicorp/go-msgpack/v2/codec" "github.com/hpcloud/tail/watch" - "github.com/hashicorp/nomad/acl" - "github.com/hashicorp/nomad/client/allocdir" - sframer "github.com/hashicorp/nomad/client/lib/streamframer" - cstructs "github.com/hashicorp/nomad/client/structs" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/acl" + "github.com/hashicorp/nomad/v2/client/allocdir" + sframer "github.com/hashicorp/nomad/v2/client/lib/streamframer" + cstructs "github.com/hashicorp/nomad/v2/client/structs" + "github.com/hashicorp/nomad/v2/nomad/structs" ) var ( diff --git a/client/fs_endpoint_test.go b/client/fs_endpoint_test.go index 9572a038e48..3e241f4a97b 100644 --- a/client/fs_endpoint_test.go +++ b/client/fs_endpoint_test.go @@ -20,18 +20,18 @@ import ( "time" "github.com/hashicorp/go-msgpack/v2/codec" - "github.com/hashicorp/nomad/acl" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/client/allocdir" - "github.com/hashicorp/nomad/client/config" - sframer "github.com/hashicorp/nomad/client/lib/streamframer" - cstructs "github.com/hashicorp/nomad/client/structs" - "github.com/hashicorp/nomad/helper/testlog" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/nomad" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/testutil" + "github.com/hashicorp/nomad/v2/acl" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/client/allocdir" + "github.com/hashicorp/nomad/v2/client/config" + sframer "github.com/hashicorp/nomad/v2/client/lib/streamframer" + cstructs "github.com/hashicorp/nomad/v2/client/structs" + "github.com/hashicorp/nomad/v2/helper/testlog" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/nomad" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/testutil" "github.com/shoenig/test/must" "github.com/stretchr/testify/require" ) diff --git a/client/gc.go b/client/gc.go index bf6b9f07dda..c4ce125729b 100644 --- a/client/gc.go +++ b/client/gc.go @@ -10,8 +10,8 @@ import ( "time" "github.com/hashicorp/go-hclog" - "github.com/hashicorp/nomad/client/allocrunner/interfaces" - "github.com/hashicorp/nomad/client/hoststats" + "github.com/hashicorp/nomad/v2/client/allocrunner/interfaces" + "github.com/hashicorp/nomad/v2/client/hoststats" ) const ( diff --git a/client/gc_test.go b/client/gc_test.go index 3348ffada55..3c0f8a9896e 100644 --- a/client/gc_test.go +++ b/client/gc_test.go @@ -7,13 +7,13 @@ import ( "testing" "time" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/client/allocrunner" - "github.com/hashicorp/nomad/client/allocrunner/interfaces" - "github.com/hashicorp/nomad/client/hoststats" - "github.com/hashicorp/nomad/helper/testlog" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/client/allocrunner" + "github.com/hashicorp/nomad/v2/client/allocrunner/interfaces" + "github.com/hashicorp/nomad/v2/client/hoststats" + "github.com/hashicorp/nomad/v2/helper/testlog" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" "github.com/shoenig/test/must" ) diff --git a/client/heartbeatstop.go b/client/heartbeatstop.go index 9db15d55d26..7b69ec6c25d 100644 --- a/client/heartbeatstop.go +++ b/client/heartbeatstop.go @@ -9,9 +9,9 @@ import ( hclog "github.com/hashicorp/go-hclog" - "github.com/hashicorp/nomad/client/allocrunner/interfaces" - "github.com/hashicorp/nomad/helper" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/client/allocrunner/interfaces" + "github.com/hashicorp/nomad/v2/helper" + "github.com/hashicorp/nomad/v2/nomad/structs" ) type heartbeatStop struct { diff --git a/client/heartbeatstop_test.go b/client/heartbeatstop_test.go index 416cb56e323..af80014a97a 100644 --- a/client/heartbeatstop_test.go +++ b/client/heartbeatstop_test.go @@ -9,11 +9,11 @@ import ( "testing" "time" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/client/allocrunner/interfaces" - "github.com/hashicorp/nomad/helper/testlog" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/client/allocrunner/interfaces" + "github.com/hashicorp/nomad/v2/helper/testlog" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/nomad/structs" "github.com/shoenig/test/must" "github.com/shoenig/test/wait" ) diff --git a/client/host_volume_endpoint.go b/client/host_volume_endpoint.go index 243605d4917..468fd471374 100644 --- a/client/host_volume_endpoint.go +++ b/client/host_volume_endpoint.go @@ -8,7 +8,7 @@ import ( "time" metrics "github.com/hashicorp/go-metrics/compat" - cstructs "github.com/hashicorp/nomad/client/structs" + cstructs "github.com/hashicorp/nomad/v2/client/structs" ) type HostVolume struct { diff --git a/client/host_volume_endpoint_test.go b/client/host_volume_endpoint_test.go index 7fa332c6a50..499ce9b9cc2 100644 --- a/client/host_volume_endpoint_test.go +++ b/client/host_volume_endpoint_test.go @@ -8,12 +8,12 @@ import ( "sort" "testing" - "github.com/hashicorp/nomad/ci" - hvm "github.com/hashicorp/nomad/client/hostvolumemanager" - "github.com/hashicorp/nomad/client/state" - cstructs "github.com/hashicorp/nomad/client/structs" - "github.com/hashicorp/nomad/helper/testlog" - "github.com/hashicorp/nomad/helper/uuid" + "github.com/hashicorp/nomad/v2/ci" + hvm "github.com/hashicorp/nomad/v2/client/hostvolumemanager" + "github.com/hashicorp/nomad/v2/client/state" + cstructs "github.com/hashicorp/nomad/v2/client/structs" + "github.com/hashicorp/nomad/v2/helper/testlog" + "github.com/hashicorp/nomad/v2/helper/uuid" "github.com/shoenig/test/must" ) diff --git a/client/hoststats/host.go b/client/hoststats/host.go index eb7da705b92..56f0f062168 100644 --- a/client/hoststats/host.go +++ b/client/hoststats/host.go @@ -9,8 +9,8 @@ import ( "time" "github.com/hashicorp/go-hclog" - "github.com/hashicorp/nomad/client/lib/numalib" - "github.com/hashicorp/nomad/plugins/device" + "github.com/hashicorp/nomad/v2/client/lib/numalib" + "github.com/hashicorp/nomad/v2/plugins/device" "github.com/shirou/gopsutil/v3/cpu" "github.com/shirou/gopsutil/v3/disk" "github.com/shirou/gopsutil/v3/host" diff --git a/client/hostvolumemanager/host_volume_plugin.go b/client/hostvolumemanager/host_volume_plugin.go index 92d8342271c..ad368006f9b 100644 --- a/client/hostvolumemanager/host_volume_plugin.go +++ b/client/hostvolumemanager/host_volume_plugin.go @@ -19,8 +19,8 @@ import ( "github.com/hashicorp/go-hclog" "github.com/hashicorp/go-multierror" "github.com/hashicorp/go-version" - cstructs "github.com/hashicorp/nomad/client/structs" - "github.com/hashicorp/nomad/helper" + cstructs "github.com/hashicorp/nomad/v2/client/structs" + "github.com/hashicorp/nomad/v2/helper" ) const ( diff --git a/client/hostvolumemanager/host_volume_plugin_test.go b/client/hostvolumemanager/host_volume_plugin_test.go index 7c82840f374..ca36770b8fe 100644 --- a/client/hostvolumemanager/host_volume_plugin_test.go +++ b/client/hostvolumemanager/host_volume_plugin_test.go @@ -11,9 +11,9 @@ import ( "testing" "github.com/hashicorp/go-version" - "github.com/hashicorp/nomad/ci" - cstructs "github.com/hashicorp/nomad/client/structs" - "github.com/hashicorp/nomad/helper/testlog" + "github.com/hashicorp/nomad/v2/ci" + cstructs "github.com/hashicorp/nomad/v2/client/structs" + "github.com/hashicorp/nomad/v2/helper/testlog" "github.com/shoenig/test/must" ) diff --git a/client/hostvolumemanager/host_volumes.go b/client/hostvolumemanager/host_volumes.go index 7d7b7c52fda..71e7ee243dd 100644 --- a/client/hostvolumemanager/host_volumes.go +++ b/client/hostvolumemanager/host_volumes.go @@ -12,9 +12,9 @@ import ( "github.com/hashicorp/go-hclog" "github.com/hashicorp/go-multierror" - cstructs "github.com/hashicorp/nomad/client/structs" - "github.com/hashicorp/nomad/helper" - "github.com/hashicorp/nomad/nomad/structs" + cstructs "github.com/hashicorp/nomad/v2/client/structs" + "github.com/hashicorp/nomad/v2/helper" + "github.com/hashicorp/nomad/v2/nomad/structs" ) var ( diff --git a/client/hostvolumemanager/host_volumes_test.go b/client/hostvolumemanager/host_volumes_test.go index 579879f82b6..05b274b56e4 100644 --- a/client/hostvolumemanager/host_volumes_test.go +++ b/client/hostvolumemanager/host_volumes_test.go @@ -15,10 +15,10 @@ import ( "github.com/hashicorp/go-hclog" "github.com/hashicorp/go-version" - cstate "github.com/hashicorp/nomad/client/state" - cstructs "github.com/hashicorp/nomad/client/structs" - "github.com/hashicorp/nomad/helper/testlog" - "github.com/hashicorp/nomad/nomad/structs" + cstate "github.com/hashicorp/nomad/v2/client/state" + cstructs "github.com/hashicorp/nomad/v2/client/structs" + "github.com/hashicorp/nomad/v2/helper/testlog" + "github.com/hashicorp/nomad/v2/nomad/structs" "github.com/shoenig/test" "github.com/shoenig/test/must" ) diff --git a/client/hostvolumemanager/volume_fingerprint.go b/client/hostvolumemanager/volume_fingerprint.go index 3e87c04753c..0fa4251714f 100644 --- a/client/hostvolumemanager/volume_fingerprint.go +++ b/client/hostvolumemanager/volume_fingerprint.go @@ -7,7 +7,7 @@ import ( "context" "github.com/hashicorp/go-hclog" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/nomad/structs" ) // this file is for fingerprinting *volumes* diff --git a/client/hostvolumemanager/volume_fingerprint_test.go b/client/hostvolumemanager/volume_fingerprint_test.go index 87b359ef812..727ad28fd66 100644 --- a/client/hostvolumemanager/volume_fingerprint_test.go +++ b/client/hostvolumemanager/volume_fingerprint_test.go @@ -7,10 +7,10 @@ import ( "path/filepath" "testing" - "github.com/hashicorp/nomad/client/state" - cstructs "github.com/hashicorp/nomad/client/structs" - "github.com/hashicorp/nomad/helper/testlog" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/client/state" + cstructs "github.com/hashicorp/nomad/v2/client/structs" + "github.com/hashicorp/nomad/v2/helper/testlog" + "github.com/hashicorp/nomad/v2/nomad/structs" "github.com/shoenig/test/must" ) diff --git a/client/identity_test.go b/client/identity_test.go index 2faf067d3ae..b926683d982 100644 --- a/client/identity_test.go +++ b/client/identity_test.go @@ -6,9 +6,9 @@ package client import ( "testing" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/client/serviceregistration/nsd" - "github.com/hashicorp/nomad/client/widmgr" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/client/serviceregistration/nsd" + "github.com/hashicorp/nomad/v2/client/widmgr" "github.com/shoenig/test/must" ) diff --git a/client/interfaces/client.go b/client/interfaces/client.go index dfa085b81be..a5eb1158ec9 100644 --- a/client/interfaces/client.go +++ b/client/interfaces/client.go @@ -4,11 +4,11 @@ package interfaces import ( - "github.com/hashicorp/nomad/client/lib/idset" - "github.com/hashicorp/nomad/client/lib/numalib/hw" - "github.com/hashicorp/nomad/client/lib/proclib" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/plugins/device" + "github.com/hashicorp/nomad/v2/client/lib/idset" + "github.com/hashicorp/nomad/v2/client/lib/numalib/hw" + "github.com/hashicorp/nomad/v2/client/lib/proclib" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/plugins/device" ) type Client interface { diff --git a/client/lib/cgroupslib/partition.go b/client/lib/cgroupslib/partition.go index dea6df5d248..588a7284105 100644 --- a/client/lib/cgroupslib/partition.go +++ b/client/lib/cgroupslib/partition.go @@ -4,8 +4,8 @@ package cgroupslib import ( - "github.com/hashicorp/nomad/client/lib/idset" - "github.com/hashicorp/nomad/client/lib/numalib/hw" + "github.com/hashicorp/nomad/v2/client/lib/idset" + "github.com/hashicorp/nomad/v2/client/lib/numalib/hw" ) // A Partition is used to track reserved vs. shared cpu cores. diff --git a/client/lib/cgroupslib/partition_default.go b/client/lib/cgroupslib/partition_default.go index 6dce4852aed..633ceb8a7cc 100644 --- a/client/lib/cgroupslib/partition_default.go +++ b/client/lib/cgroupslib/partition_default.go @@ -7,8 +7,8 @@ package cgroupslib import ( "github.com/hashicorp/go-hclog" - "github.com/hashicorp/nomad/client/lib/idset" - "github.com/hashicorp/nomad/client/lib/numalib/hw" + "github.com/hashicorp/nomad/v2/client/lib/idset" + "github.com/hashicorp/nomad/v2/client/lib/numalib/hw" ) // GetPartition creates a no-op Partition that does not do anything. diff --git a/client/lib/cgroupslib/partition_linux.go b/client/lib/cgroupslib/partition_linux.go index 4e9229eb0ea..dda05b36d86 100644 --- a/client/lib/cgroupslib/partition_linux.go +++ b/client/lib/cgroupslib/partition_linux.go @@ -12,8 +12,8 @@ import ( "sync" "github.com/hashicorp/go-hclog" - "github.com/hashicorp/nomad/client/lib/idset" - "github.com/hashicorp/nomad/client/lib/numalib/hw" + "github.com/hashicorp/nomad/v2/client/lib/idset" + "github.com/hashicorp/nomad/v2/client/lib/numalib/hw" ) // GetPartition creates a Partition suitable for managing cores on this diff --git a/client/lib/cgroupslib/partition_noop.go b/client/lib/cgroupslib/partition_noop.go index 118e08b81f0..8a29f0326e3 100644 --- a/client/lib/cgroupslib/partition_noop.go +++ b/client/lib/cgroupslib/partition_noop.go @@ -4,8 +4,8 @@ package cgroupslib import ( - "github.com/hashicorp/nomad/client/lib/idset" - "github.com/hashicorp/nomad/client/lib/numalib/hw" + "github.com/hashicorp/nomad/v2/client/lib/idset" + "github.com/hashicorp/nomad/v2/client/lib/numalib/hw" ) func NoopPartition() Partition { diff --git a/client/lib/cgroupslib/partition_test.go b/client/lib/cgroupslib/partition_test.go index 24efe145651..9e647b4d207 100644 --- a/client/lib/cgroupslib/partition_test.go +++ b/client/lib/cgroupslib/partition_test.go @@ -9,8 +9,8 @@ import ( "path/filepath" "testing" - "github.com/hashicorp/nomad/client/lib/idset" - "github.com/hashicorp/nomad/client/lib/numalib/hw" + "github.com/hashicorp/nomad/v2/client/lib/idset" + "github.com/hashicorp/nomad/v2/client/lib/numalib/hw" "github.com/shoenig/test/must" ) diff --git a/client/lib/cpustats/stats.go b/client/lib/cpustats/stats.go index de736f6d661..39b9b93f5ef 100644 --- a/client/lib/cpustats/stats.go +++ b/client/lib/cpustats/stats.go @@ -7,7 +7,7 @@ package cpustats import ( "time" - "github.com/hashicorp/nomad/client/lib/numalib/hw" + "github.com/hashicorp/nomad/v2/client/lib/numalib/hw" "oss.indeed.com/go/libtime" ) diff --git a/client/lib/fifo/fifo_test.go b/client/lib/fifo/fifo_test.go index 8c8a489e16e..a0ddf4489de 100644 --- a/client/lib/fifo/fifo_test.go +++ b/client/lib/fifo/fifo_test.go @@ -12,7 +12,7 @@ import ( "testing" "time" - "github.com/hashicorp/nomad/helper/uuid" + "github.com/hashicorp/nomad/v2/helper/uuid" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/client/lib/numalib/detect.go b/client/lib/numalib/detect.go index 492f0460caa..dcfb7ded630 100644 --- a/client/lib/numalib/detect.go +++ b/client/lib/numalib/detect.go @@ -4,8 +4,8 @@ package numalib import ( - "github.com/hashicorp/nomad/client/lib/idset" - "github.com/hashicorp/nomad/client/lib/numalib/hw" + "github.com/hashicorp/nomad/v2/client/lib/idset" + "github.com/hashicorp/nomad/v2/client/lib/numalib/hw" ) // A SystemScanner represents one methodology of detecting CPU hardware on a diff --git a/client/lib/numalib/detect_darwin.go b/client/lib/numalib/detect_darwin.go index 7ab5f2740e1..b426d41b090 100644 --- a/client/lib/numalib/detect_darwin.go +++ b/client/lib/numalib/detect_darwin.go @@ -6,8 +6,8 @@ package numalib import ( - "github.com/hashicorp/nomad/client/lib/idset" - "github.com/hashicorp/nomad/client/lib/numalib/hw" + "github.com/hashicorp/nomad/v2/client/lib/idset" + "github.com/hashicorp/nomad/v2/client/lib/numalib/hw" "github.com/shoenig/go-m1cpu" "golang.org/x/sys/unix" ) diff --git a/client/lib/numalib/detect_generic.go b/client/lib/numalib/detect_generic.go index 797bf69eb24..077a58ed61b 100644 --- a/client/lib/numalib/detect_generic.go +++ b/client/lib/numalib/detect_generic.go @@ -7,8 +7,8 @@ import ( "context" "time" - "github.com/hashicorp/nomad/client/lib/idset" - "github.com/hashicorp/nomad/client/lib/numalib/hw" + "github.com/hashicorp/nomad/v2/client/lib/idset" + "github.com/hashicorp/nomad/v2/client/lib/numalib/hw" "github.com/shirou/gopsutil/v3/cpu" ) diff --git a/client/lib/numalib/detect_linux.go b/client/lib/numalib/detect_linux.go index 7702016ab31..761ad8696a6 100644 --- a/client/lib/numalib/detect_linux.go +++ b/client/lib/numalib/detect_linux.go @@ -13,9 +13,9 @@ import ( "strconv" "strings" - "github.com/hashicorp/nomad/client/lib/cgroupslib" - "github.com/hashicorp/nomad/client/lib/idset" - "github.com/hashicorp/nomad/client/lib/numalib/hw" + "github.com/hashicorp/nomad/v2/client/lib/cgroupslib" + "github.com/hashicorp/nomad/v2/client/lib/idset" + "github.com/hashicorp/nomad/v2/client/lib/numalib/hw" ) // PlatformScanners returns the set of SystemScanner for Linux. diff --git a/client/lib/numalib/detect_linux_test.go b/client/lib/numalib/detect_linux_test.go index 4a1eeb786ea..fe81c11ca16 100644 --- a/client/lib/numalib/detect_linux_test.go +++ b/client/lib/numalib/detect_linux_test.go @@ -10,8 +10,8 @@ import ( "os" "testing" - "github.com/hashicorp/nomad/client/lib/idset" - "github.com/hashicorp/nomad/client/lib/numalib/hw" + "github.com/hashicorp/nomad/v2/client/lib/idset" + "github.com/hashicorp/nomad/v2/client/lib/numalib/hw" "github.com/shoenig/test/must" ) diff --git a/client/lib/numalib/detect_smbios.go b/client/lib/numalib/detect_smbios.go index 423a52d2e67..6608aa5dbc5 100644 --- a/client/lib/numalib/detect_smbios.go +++ b/client/lib/numalib/detect_smbios.go @@ -12,7 +12,7 @@ import ( "strconv" "time" - "github.com/hashicorp/nomad/client/lib/numalib/hw" + "github.com/hashicorp/nomad/v2/client/lib/numalib/hw" ) const ( diff --git a/client/lib/numalib/testing.go b/client/lib/numalib/testing.go index 4f91db7cf97..3d3916d6e2a 100644 --- a/client/lib/numalib/testing.go +++ b/client/lib/numalib/testing.go @@ -4,8 +4,8 @@ package numalib import ( - "github.com/hashicorp/nomad/client/lib/idset" - "github.com/hashicorp/nomad/client/lib/numalib/hw" + "github.com/hashicorp/nomad/v2/client/lib/idset" + "github.com/hashicorp/nomad/v2/client/lib/numalib/hw" ) // MockTopology is a constructor for the Topology object, only used in tests for diff --git a/client/lib/numalib/topology.go b/client/lib/numalib/topology.go index e8bf5eacd6b..1e440333f62 100644 --- a/client/lib/numalib/topology.go +++ b/client/lib/numalib/topology.go @@ -12,9 +12,9 @@ import ( "runtime" "strings" - "github.com/hashicorp/nomad/client/lib/cpustats" - "github.com/hashicorp/nomad/client/lib/idset" - "github.com/hashicorp/nomad/client/lib/numalib/hw" + "github.com/hashicorp/nomad/v2/client/lib/cpustats" + "github.com/hashicorp/nomad/v2/client/lib/idset" + "github.com/hashicorp/nomad/v2/client/lib/numalib/hw" ) // CoreGrade describes whether a specific core is a performance or efficiency diff --git a/client/lib/proclib/config.go b/client/lib/proclib/config.go index ed2094f80a6..ad89ed36916 100644 --- a/client/lib/proclib/config.go +++ b/client/lib/proclib/config.go @@ -5,8 +5,8 @@ package proclib import ( "github.com/hashicorp/go-hclog" - "github.com/hashicorp/nomad/client/lib/idset" - "github.com/hashicorp/nomad/client/lib/numalib/hw" + "github.com/hashicorp/nomad/v2/client/lib/idset" + "github.com/hashicorp/nomad/v2/client/lib/numalib/hw" ) // Configs is used to pass along values from client configuration that are diff --git a/client/lib/proclib/testing.go b/client/lib/proclib/testing.go index 24265b33767..c180e6b21fc 100644 --- a/client/lib/proclib/testing.go +++ b/client/lib/proclib/testing.go @@ -6,7 +6,7 @@ package proclib import ( "testing" - "github.com/hashicorp/nomad/helper/testlog" + "github.com/hashicorp/nomad/v2/helper/testlog" ) func MockWranglers(t testing.TB) *Wranglers { diff --git a/client/lib/proclib/wrangler_cg1_linux.go b/client/lib/proclib/wrangler_cg1_linux.go index 9aab7f322fd..25cf16c2952 100644 --- a/client/lib/proclib/wrangler_cg1_linux.go +++ b/client/lib/proclib/wrangler_cg1_linux.go @@ -9,7 +9,7 @@ import ( "time" "github.com/hashicorp/go-hclog" - "github.com/hashicorp/nomad/client/lib/cgroupslib" + "github.com/hashicorp/nomad/v2/client/lib/cgroupslib" "oss.indeed.com/go/libtime/decay" ) diff --git a/client/lib/proclib/wrangler_cg2_linux.go b/client/lib/proclib/wrangler_cg2_linux.go index f3be5f5abf3..72aa650a268 100644 --- a/client/lib/proclib/wrangler_cg2_linux.go +++ b/client/lib/proclib/wrangler_cg2_linux.go @@ -7,7 +7,7 @@ package proclib import ( "github.com/hashicorp/go-hclog" - "github.com/hashicorp/nomad/client/lib/cgroupslib" + "github.com/hashicorp/nomad/v2/client/lib/cgroupslib" ) // LinuxWranglerCG2 is an implementation of ProcessWrangler that leverages diff --git a/client/lib/proclib/wrangler_linux.go b/client/lib/proclib/wrangler_linux.go index 3dc6e8c76a5..c87bf4f0c7c 100644 --- a/client/lib/proclib/wrangler_linux.go +++ b/client/lib/proclib/wrangler_linux.go @@ -6,7 +6,7 @@ package proclib import ( - "github.com/hashicorp/nomad/client/lib/cgroupslib" + "github.com/hashicorp/nomad/v2/client/lib/cgroupslib" ) // New creates a Wranglers factory for creating ProcessWrangler's appropriate diff --git a/client/lib/streamframer/framer_test.go b/client/lib/streamframer/framer_test.go index 93d4f7ce8fd..8191207d65b 100644 --- a/client/lib/streamframer/framer_test.go +++ b/client/lib/streamframer/framer_test.go @@ -10,7 +10,7 @@ import ( "testing" "time" - "github.com/hashicorp/nomad/testutil" + "github.com/hashicorp/nomad/v2/testutil" "github.com/kr/pretty" ) diff --git a/client/logmon/client.go b/client/logmon/client.go index 22a09017eef..b9635c8297f 100644 --- a/client/logmon/client.go +++ b/client/logmon/client.go @@ -7,8 +7,8 @@ import ( "context" "time" - "github.com/hashicorp/nomad/client/logmon/proto" - "github.com/hashicorp/nomad/helper/pluginutils/grpcutils" + "github.com/hashicorp/nomad/v2/client/logmon/proto" + "github.com/hashicorp/nomad/v2/helper/pluginutils/grpcutils" ) type logmonClient struct { diff --git a/client/logmon/logging/rotator_test.go b/client/logmon/logging/rotator_test.go index 7fc66a883c8..e78e770b3bb 100644 --- a/client/logmon/logging/rotator_test.go +++ b/client/logmon/logging/rotator_test.go @@ -10,8 +10,8 @@ import ( "path/filepath" "testing" - "github.com/hashicorp/nomad/helper/testlog" - "github.com/hashicorp/nomad/testutil" + "github.com/hashicorp/nomad/v2/helper/testlog" + "github.com/hashicorp/nomad/v2/testutil" "github.com/shoenig/test/must" "go.uber.org/goleak" ) diff --git a/client/logmon/logmon.go b/client/logmon/logmon.go index 60e4e5df802..5fc40ded827 100644 --- a/client/logmon/logmon.go +++ b/client/logmon/logmon.go @@ -12,8 +12,8 @@ import ( "time" hclog "github.com/hashicorp/go-hclog" - "github.com/hashicorp/nomad/client/lib/fifo" - "github.com/hashicorp/nomad/client/logmon/logging" + "github.com/hashicorp/nomad/v2/client/lib/fifo" + "github.com/hashicorp/nomad/v2/client/logmon/logging" ) const ( diff --git a/client/logmon/logmon_test.go b/client/logmon/logmon_test.go index bf5c102d32e..dfeb8aaabc6 100644 --- a/client/logmon/logmon_test.go +++ b/client/logmon/logmon_test.go @@ -11,11 +11,11 @@ import ( "runtime" "testing" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/client/lib/fifo" - "github.com/hashicorp/nomad/helper/testlog" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/testutil" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/client/lib/fifo" + "github.com/hashicorp/nomad/v2/helper/testlog" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/testutil" "github.com/shoenig/test/must" ) diff --git a/client/logmon/plugin.go b/client/logmon/plugin.go index d0fdea7cfbb..093bbe43c4d 100644 --- a/client/logmon/plugin.go +++ b/client/logmon/plugin.go @@ -10,8 +10,8 @@ import ( "github.com/hashicorp/go-hclog" "github.com/hashicorp/go-plugin" - "github.com/hashicorp/nomad/client/logmon/proto" - "github.com/hashicorp/nomad/plugins/base" + "github.com/hashicorp/nomad/v2/client/logmon/proto" + "github.com/hashicorp/nomad/v2/plugins/base" "google.golang.org/grpc" ) diff --git a/client/logmon/server.go b/client/logmon/server.go index 00cfecb0d63..4cd4b757c7e 100644 --- a/client/logmon/server.go +++ b/client/logmon/server.go @@ -7,7 +7,7 @@ import ( "context" "github.com/hashicorp/go-plugin" - "github.com/hashicorp/nomad/client/logmon/proto" + "github.com/hashicorp/nomad/v2/client/logmon/proto" ) type logmonServer struct { diff --git a/client/logmon/z_logmon_cmd.go b/client/logmon/z_logmon_cmd.go index 58ca367e0c5..9085a8f92cb 100644 --- a/client/logmon/z_logmon_cmd.go +++ b/client/logmon/z_logmon_cmd.go @@ -8,7 +8,7 @@ import ( hclog "github.com/hashicorp/go-hclog" plugin "github.com/hashicorp/go-plugin" - "github.com/hashicorp/nomad/plugins/base" + "github.com/hashicorp/nomad/v2/plugins/base" ) // Install a plugin cli handler to ease working with tests diff --git a/client/meta_endpoint.go b/client/meta_endpoint.go index 30c11e52a6f..583e9420f0d 100644 --- a/client/meta_endpoint.go +++ b/client/meta_endpoint.go @@ -9,7 +9,7 @@ import ( "time" metrics "github.com/hashicorp/go-metrics/compat" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/nomad/structs" ) type NodeMeta struct { diff --git a/client/meta_endpoint_test.go b/client/meta_endpoint_test.go index d41c002ae51..57feae713b0 100644 --- a/client/meta_endpoint_test.go +++ b/client/meta_endpoint_test.go @@ -6,13 +6,13 @@ package client import ( "testing" - "github.com/hashicorp/nomad/acl" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/client/config" - "github.com/hashicorp/nomad/nomad" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/testutil" + "github.com/hashicorp/nomad/v2/acl" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/client/config" + "github.com/hashicorp/nomad/v2/nomad" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/testutil" "github.com/shoenig/test/must" ) diff --git a/client/node_identity_endpoint.go b/client/node_identity_endpoint.go index deb0067c8fe..ff3e1137a5c 100644 --- a/client/node_identity_endpoint.go +++ b/client/node_identity_endpoint.go @@ -8,7 +8,7 @@ import ( "fmt" "github.com/go-jose/go-jose/v3/jwt" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/nomad/structs" ) type NodeIdentity struct { diff --git a/client/node_identity_endpoint_test.go b/client/node_identity_endpoint_test.go index a2c72ea71d8..64c8e7a9660 100644 --- a/client/node_identity_endpoint_test.go +++ b/client/node_identity_endpoint_test.go @@ -6,13 +6,13 @@ package client import ( "testing" - "github.com/hashicorp/nomad/acl" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/client/config" - "github.com/hashicorp/nomad/nomad" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/testutil" + "github.com/hashicorp/nomad/v2/acl" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/client/config" + "github.com/hashicorp/nomad/v2/nomad" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/testutil" "github.com/shoenig/test/must" ) diff --git a/client/node_updater.go b/client/node_updater.go index 87a5b206b61..e87ec044d20 100644 --- a/client/node_updater.go +++ b/client/node_updater.go @@ -10,11 +10,11 @@ import ( "time" "github.com/hashicorp/go-hclog" - "github.com/hashicorp/nomad/client/devicemanager" - hvm "github.com/hashicorp/nomad/client/hostvolumemanager" - "github.com/hashicorp/nomad/client/pluginmanager/csimanager" - "github.com/hashicorp/nomad/client/pluginmanager/drivermanager" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/client/devicemanager" + hvm "github.com/hashicorp/nomad/v2/client/hostvolumemanager" + "github.com/hashicorp/nomad/v2/client/pluginmanager/csimanager" + "github.com/hashicorp/nomad/v2/client/pluginmanager/drivermanager" + "github.com/hashicorp/nomad/v2/nomad/structs" ) var ( diff --git a/client/pluginmanager/csimanager/fingerprint.go b/client/pluginmanager/csimanager/fingerprint.go index c81652ea011..3eda9eb2173 100644 --- a/client/pluginmanager/csimanager/fingerprint.go +++ b/client/pluginmanager/csimanager/fingerprint.go @@ -9,9 +9,9 @@ import ( "maps" "github.com/hashicorp/go-hclog" - "github.com/hashicorp/nomad/client/dynamicplugins" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/plugins/csi" + "github.com/hashicorp/nomad/v2/client/dynamicplugins" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/plugins/csi" ) type pluginFingerprinter struct { diff --git a/client/pluginmanager/csimanager/fingerprint_test.go b/client/pluginmanager/csimanager/fingerprint_test.go index 3bd7fa03c44..7213014913e 100644 --- a/client/pluginmanager/csimanager/fingerprint_test.go +++ b/client/pluginmanager/csimanager/fingerprint_test.go @@ -8,8 +8,8 @@ import ( "errors" "testing" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/plugins/csi" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/plugins/csi" "github.com/stretchr/testify/require" ) diff --git a/client/pluginmanager/csimanager/instance.go b/client/pluginmanager/csimanager/instance.go index 458b6edc082..3d283535e98 100644 --- a/client/pluginmanager/csimanager/instance.go +++ b/client/pluginmanager/csimanager/instance.go @@ -8,8 +8,8 @@ import ( "time" "github.com/hashicorp/go-hclog" - "github.com/hashicorp/nomad/client/dynamicplugins" - "github.com/hashicorp/nomad/plugins/csi" + "github.com/hashicorp/nomad/v2/client/dynamicplugins" + "github.com/hashicorp/nomad/v2/plugins/csi" ) const managerFingerprintInterval = 30 * time.Second diff --git a/client/pluginmanager/csimanager/instance_test.go b/client/pluginmanager/csimanager/instance_test.go index b0c39181f82..bf48bd7b1df 100644 --- a/client/pluginmanager/csimanager/instance_test.go +++ b/client/pluginmanager/csimanager/instance_test.go @@ -9,11 +9,11 @@ import ( "testing" "time" - "github.com/hashicorp/nomad/client/dynamicplugins" - "github.com/hashicorp/nomad/helper/testlog" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/plugins/csi" - "github.com/hashicorp/nomad/plugins/csi/fake" + "github.com/hashicorp/nomad/v2/client/dynamicplugins" + "github.com/hashicorp/nomad/v2/helper/testlog" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/plugins/csi" + "github.com/hashicorp/nomad/v2/plugins/csi/fake" "github.com/stretchr/testify/require" ) diff --git a/client/pluginmanager/csimanager/interface.go b/client/pluginmanager/csimanager/interface.go index 38cb57fc36b..abba16ff93a 100644 --- a/client/pluginmanager/csimanager/interface.go +++ b/client/pluginmanager/csimanager/interface.go @@ -7,9 +7,9 @@ import ( "context" "strings" - "github.com/hashicorp/nomad/client/pluginmanager" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/plugins/csi" + "github.com/hashicorp/nomad/v2/client/pluginmanager" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/plugins/csi" ) type MountInfo struct { diff --git a/client/pluginmanager/csimanager/manager.go b/client/pluginmanager/csimanager/manager.go index c4723704cd9..508773826b5 100644 --- a/client/pluginmanager/csimanager/manager.go +++ b/client/pluginmanager/csimanager/manager.go @@ -10,9 +10,9 @@ import ( "time" "github.com/hashicorp/go-hclog" - "github.com/hashicorp/nomad/client/dynamicplugins" - "github.com/hashicorp/nomad/client/pluginmanager" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/client/dynamicplugins" + "github.com/hashicorp/nomad/v2/client/pluginmanager" + "github.com/hashicorp/nomad/v2/nomad/structs" ) // defaultPluginResyncPeriod is the time interval used to do a full resync diff --git a/client/pluginmanager/csimanager/manager_test.go b/client/pluginmanager/csimanager/manager_test.go index b90aba0f133..d51ad2668ad 100644 --- a/client/pluginmanager/csimanager/manager_test.go +++ b/client/pluginmanager/csimanager/manager_test.go @@ -10,11 +10,11 @@ import ( "testing" "time" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/client/dynamicplugins" - "github.com/hashicorp/nomad/client/pluginmanager" - "github.com/hashicorp/nomad/helper/testlog" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/client/dynamicplugins" + "github.com/hashicorp/nomad/v2/client/pluginmanager" + "github.com/hashicorp/nomad/v2/helper/testlog" + "github.com/hashicorp/nomad/v2/nomad/structs" "github.com/shoenig/test/must" "github.com/stretchr/testify/require" ) diff --git a/client/pluginmanager/csimanager/testing.go b/client/pluginmanager/csimanager/testing.go index c933222c4e6..5c286983364 100644 --- a/client/pluginmanager/csimanager/testing.go +++ b/client/pluginmanager/csimanager/testing.go @@ -7,10 +7,10 @@ import ( "context" "path/filepath" - "github.com/hashicorp/nomad/client/pluginmanager" - nstructs "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/plugins/csi" - "github.com/hashicorp/nomad/testutil" + "github.com/hashicorp/nomad/v2/client/pluginmanager" + nstructs "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/plugins/csi" + "github.com/hashicorp/nomad/v2/testutil" ) var _ Manager = &MockCSIManager{} diff --git a/client/pluginmanager/csimanager/usage_tracker_test.go b/client/pluginmanager/csimanager/usage_tracker_test.go index c5e751d8dfd..114b0983d07 100644 --- a/client/pluginmanager/csimanager/usage_tracker_test.go +++ b/client/pluginmanager/csimanager/usage_tracker_test.go @@ -6,8 +6,8 @@ package csimanager import ( "testing" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" "github.com/stretchr/testify/require" ) diff --git a/client/pluginmanager/csimanager/volume.go b/client/pluginmanager/csimanager/volume.go index 69ccce61ac1..0e1872ad591 100644 --- a/client/pluginmanager/csimanager/volume.go +++ b/client/pluginmanager/csimanager/volume.go @@ -17,9 +17,9 @@ import ( grpc_retry "github.com/grpc-ecosystem/go-grpc-middleware/retry" "github.com/hashicorp/go-hclog" "github.com/hashicorp/go-multierror" - "github.com/hashicorp/nomad/helper/mount" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/plugins/csi" + "github.com/hashicorp/nomad/v2/helper/mount" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/plugins/csi" ) var _ VolumeManager = &volumeManager{} diff --git a/client/pluginmanager/csimanager/volume_test.go b/client/pluginmanager/csimanager/volume_test.go index 45648dd4896..4724d5a8384 100644 --- a/client/pluginmanager/csimanager/volume_test.go +++ b/client/pluginmanager/csimanager/volume_test.go @@ -13,13 +13,13 @@ import ( "time" "github.com/hashicorp/go-hclog" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/helper/mount" - "github.com/hashicorp/nomad/helper/testlog" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/plugins/csi" - csifake "github.com/hashicorp/nomad/plugins/csi/fake" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/helper/mount" + "github.com/hashicorp/nomad/v2/helper/testlog" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/plugins/csi" + csifake "github.com/hashicorp/nomad/v2/plugins/csi/fake" "github.com/shoenig/test/must" "github.com/stretchr/testify/require" ) diff --git a/client/pluginmanager/drivermanager/instance.go b/client/pluginmanager/drivermanager/instance.go index 84ca2eff686..3175c01620d 100644 --- a/client/pluginmanager/drivermanager/instance.go +++ b/client/pluginmanager/drivermanager/instance.go @@ -10,13 +10,13 @@ import ( "time" log "github.com/hashicorp/go-hclog" - "github.com/hashicorp/nomad/helper" - "github.com/hashicorp/nomad/helper/pluginutils/loader" - "github.com/hashicorp/nomad/helper/pluginutils/singleton" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/plugins/base" - bstructs "github.com/hashicorp/nomad/plugins/base/structs" - "github.com/hashicorp/nomad/plugins/drivers" + "github.com/hashicorp/nomad/v2/helper" + "github.com/hashicorp/nomad/v2/helper/pluginutils/loader" + "github.com/hashicorp/nomad/v2/helper/pluginutils/singleton" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/plugins/base" + bstructs "github.com/hashicorp/nomad/v2/plugins/base/structs" + "github.com/hashicorp/nomad/v2/plugins/drivers" ) const ( diff --git a/client/pluginmanager/drivermanager/instance_test.go b/client/pluginmanager/drivermanager/instance_test.go index a9fe71584f4..f0e94a6ed31 100644 --- a/client/pluginmanager/drivermanager/instance_test.go +++ b/client/pluginmanager/drivermanager/instance_test.go @@ -10,12 +10,12 @@ import ( log "github.com/hashicorp/go-hclog" "github.com/hashicorp/go-plugin" - "github.com/hashicorp/nomad/helper/pluginutils/loader" - "github.com/hashicorp/nomad/helper/pluginutils/singleton" - "github.com/hashicorp/nomad/helper/testlog" - "github.com/hashicorp/nomad/plugins/base" - "github.com/hashicorp/nomad/plugins/drivers" - dtu "github.com/hashicorp/nomad/plugins/drivers/testutils" + "github.com/hashicorp/nomad/v2/helper/pluginutils/loader" + "github.com/hashicorp/nomad/v2/helper/pluginutils/singleton" + "github.com/hashicorp/nomad/v2/helper/testlog" + "github.com/hashicorp/nomad/v2/plugins/base" + "github.com/hashicorp/nomad/v2/plugins/drivers" + dtu "github.com/hashicorp/nomad/v2/plugins/drivers/testutils" "github.com/shoenig/test/must" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" diff --git a/client/pluginmanager/drivermanager/manager.go b/client/pluginmanager/drivermanager/manager.go index aec00434bfc..11db986584f 100644 --- a/client/pluginmanager/drivermanager/manager.go +++ b/client/pluginmanager/drivermanager/manager.go @@ -10,13 +10,13 @@ import ( log "github.com/hashicorp/go-hclog" plugin "github.com/hashicorp/go-plugin" - "github.com/hashicorp/nomad/client/pluginmanager" - "github.com/hashicorp/nomad/client/pluginmanager/drivermanager/state" - "github.com/hashicorp/nomad/helper/pluginutils/loader" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/plugins/base" - "github.com/hashicorp/nomad/plugins/drivers" - pstructs "github.com/hashicorp/nomad/plugins/shared/structs" + "github.com/hashicorp/nomad/v2/client/pluginmanager" + "github.com/hashicorp/nomad/v2/client/pluginmanager/drivermanager/state" + "github.com/hashicorp/nomad/v2/helper/pluginutils/loader" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/plugins/base" + "github.com/hashicorp/nomad/v2/plugins/drivers" + pstructs "github.com/hashicorp/nomad/v2/plugins/shared/structs" ) // ErrDriverNotFound is returned during Dispense when the requested driver diff --git a/client/pluginmanager/drivermanager/manager_test.go b/client/pluginmanager/drivermanager/manager_test.go index 91dfe22f5d2..3bfc7f5ff50 100644 --- a/client/pluginmanager/drivermanager/manager_test.go +++ b/client/pluginmanager/drivermanager/manager_test.go @@ -12,16 +12,16 @@ import ( log "github.com/hashicorp/go-hclog" plugin "github.com/hashicorp/go-plugin" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/client/pluginmanager" - "github.com/hashicorp/nomad/client/state" - "github.com/hashicorp/nomad/helper/pluginutils/loader" - "github.com/hashicorp/nomad/helper/testlog" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/plugins/base" - "github.com/hashicorp/nomad/plugins/drivers" - dtu "github.com/hashicorp/nomad/plugins/drivers/testutils" - "github.com/hashicorp/nomad/testutil" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/client/pluginmanager" + "github.com/hashicorp/nomad/v2/client/state" + "github.com/hashicorp/nomad/v2/helper/pluginutils/loader" + "github.com/hashicorp/nomad/v2/helper/testlog" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/plugins/base" + "github.com/hashicorp/nomad/v2/plugins/drivers" + dtu "github.com/hashicorp/nomad/v2/plugins/drivers/testutils" + "github.com/hashicorp/nomad/v2/testutil" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/client/pluginmanager/drivermanager/state/state.go b/client/pluginmanager/drivermanager/state/state.go index a9e23baff9c..0c054e7ddcd 100644 --- a/client/pluginmanager/drivermanager/state/state.go +++ b/client/pluginmanager/drivermanager/state/state.go @@ -3,7 +3,7 @@ package state -import pstructs "github.com/hashicorp/nomad/plugins/shared/structs" +import pstructs "github.com/hashicorp/nomad/v2/plugins/shared/structs" // PluginState is used to store the driver manager's state across restarts of the // agent diff --git a/client/pluginmanager/drivermanager/testing.go b/client/pluginmanager/drivermanager/testing.go index 6dafc11a791..8a1c079a3c7 100644 --- a/client/pluginmanager/drivermanager/testing.go +++ b/client/pluginmanager/drivermanager/testing.go @@ -11,13 +11,13 @@ import ( "testing" log "github.com/hashicorp/go-hclog" - "github.com/hashicorp/nomad/client/lib/numalib" - "github.com/hashicorp/nomad/helper/pluginutils/catalog" - "github.com/hashicorp/nomad/helper/pluginutils/loader" - "github.com/hashicorp/nomad/helper/pluginutils/singleton" - "github.com/hashicorp/nomad/helper/testlog" - "github.com/hashicorp/nomad/plugins/base" - "github.com/hashicorp/nomad/plugins/drivers" + "github.com/hashicorp/nomad/v2/client/lib/numalib" + "github.com/hashicorp/nomad/v2/helper/pluginutils/catalog" + "github.com/hashicorp/nomad/v2/helper/pluginutils/loader" + "github.com/hashicorp/nomad/v2/helper/pluginutils/singleton" + "github.com/hashicorp/nomad/v2/helper/testlog" + "github.com/hashicorp/nomad/v2/plugins/base" + "github.com/hashicorp/nomad/v2/plugins/drivers" ) type testManager struct { diff --git a/client/pluginmanager/group_test.go b/client/pluginmanager/group_test.go index 3e4eac2a668..2e7c772afe1 100644 --- a/client/pluginmanager/group_test.go +++ b/client/pluginmanager/group_test.go @@ -9,8 +9,8 @@ import ( "testing" "time" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/helper/testlog" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/helper/testlog" "github.com/stretchr/testify/require" ) diff --git a/client/rpc.go b/client/rpc.go index 0f6047652fe..53c28679df0 100644 --- a/client/rpc.go +++ b/client/rpc.go @@ -13,11 +13,11 @@ import ( metrics "github.com/hashicorp/go-metrics/compat" "github.com/hashicorp/go-msgpack/v2/codec" - "github.com/hashicorp/nomad/client/servers" - "github.com/hashicorp/nomad/helper" - inmem "github.com/hashicorp/nomad/helper/codec" - "github.com/hashicorp/nomad/helper/pool" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/client/servers" + "github.com/hashicorp/nomad/v2/helper" + inmem "github.com/hashicorp/nomad/v2/helper/codec" + "github.com/hashicorp/nomad/v2/helper/pool" + "github.com/hashicorp/nomad/v2/nomad/structs" ) // rpcEndpoints holds the RPC endpoints diff --git a/client/rpc_test.go b/client/rpc_test.go index 09123a36e7e..8cd5f0e4241 100644 --- a/client/rpc_test.go +++ b/client/rpc_test.go @@ -8,12 +8,12 @@ import ( "testing" "time" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/client/config" - "github.com/hashicorp/nomad/nomad" - "github.com/hashicorp/nomad/nomad/structs" - sconfig "github.com/hashicorp/nomad/nomad/structs/config" - "github.com/hashicorp/nomad/testutil" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/client/config" + "github.com/hashicorp/nomad/v2/nomad" + "github.com/hashicorp/nomad/v2/nomad/structs" + sconfig "github.com/hashicorp/nomad/v2/nomad/structs/config" + "github.com/hashicorp/nomad/v2/testutil" "github.com/shoenig/test/must" "github.com/stretchr/testify/require" ) diff --git a/client/servers/manager.go b/client/servers/manager.go index e13d578bc86..73c6325288c 100644 --- a/client/servers/manager.go +++ b/client/servers/manager.go @@ -15,7 +15,7 @@ import ( "time" hclog "github.com/hashicorp/go-hclog" - "github.com/hashicorp/nomad/helper" + "github.com/hashicorp/nomad/v2/helper" ) const ( diff --git a/client/servers/manager_internal_test.go b/client/servers/manager_internal_test.go index 288e363982a..de3df8513cc 100644 --- a/client/servers/manager_internal_test.go +++ b/client/servers/manager_internal_test.go @@ -10,8 +10,8 @@ import ( "testing" "time" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/helper/testlog" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/helper/testlog" "github.com/shoenig/test/must" ) diff --git a/client/servers/manager_test.go b/client/servers/manager_test.go index 1992788c0ee..12c75f7d966 100644 --- a/client/servers/manager_test.go +++ b/client/servers/manager_test.go @@ -10,9 +10,9 @@ import ( "strings" "testing" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/client/servers" - "github.com/hashicorp/nomad/helper/testlog" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/client/servers" + "github.com/hashicorp/nomad/v2/helper/testlog" "github.com/shoenig/test/must" ) diff --git a/client/serviceregistration/address.go b/client/serviceregistration/address.go index 7d411bf528e..ffc2c4d9324 100644 --- a/client/serviceregistration/address.go +++ b/client/serviceregistration/address.go @@ -7,8 +7,8 @@ import ( "fmt" "strconv" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/plugins/drivers" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/plugins/drivers" ) // GetAddress returns the IP (or custom advertise address) and port to use for a diff --git a/client/serviceregistration/address_test.go b/client/serviceregistration/address_test.go index 5adffc0b59b..e3ffc6c70de 100644 --- a/client/serviceregistration/address_test.go +++ b/client/serviceregistration/address_test.go @@ -6,8 +6,8 @@ package serviceregistration import ( "testing" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/plugins/drivers" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/plugins/drivers" "github.com/stretchr/testify/require" ) diff --git a/client/serviceregistration/checks/checkstore/shim.go b/client/serviceregistration/checks/checkstore/shim.go index c03f1fa8ec9..29fa09e1d34 100644 --- a/client/serviceregistration/checks/checkstore/shim.go +++ b/client/serviceregistration/checks/checkstore/shim.go @@ -9,9 +9,9 @@ import ( "sync" "github.com/hashicorp/go-hclog" - "github.com/hashicorp/nomad/client/serviceregistration/checks" - "github.com/hashicorp/nomad/client/state" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/client/serviceregistration/checks" + "github.com/hashicorp/nomad/v2/client/state" + "github.com/hashicorp/nomad/v2/nomad/structs" ) // A Shim is used to track the latest check status information, one layer above diff --git a/client/serviceregistration/checks/checkstore/shim_test.go b/client/serviceregistration/checks/checkstore/shim_test.go index 4cb31922f59..e857def11b4 100644 --- a/client/serviceregistration/checks/checkstore/shim_test.go +++ b/client/serviceregistration/checks/checkstore/shim_test.go @@ -7,12 +7,12 @@ import ( "slices" "testing" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/client/serviceregistration/checks" - "github.com/hashicorp/nomad/client/state" - "github.com/hashicorp/nomad/helper/testlog" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/client/serviceregistration/checks" + "github.com/hashicorp/nomad/v2/client/state" + "github.com/hashicorp/nomad/v2/helper/testlog" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/nomad/structs" "github.com/shoenig/test/must" ) diff --git a/client/serviceregistration/checks/client.go b/client/serviceregistration/checks/client.go index 4aa479d2517..a6093ca8b1e 100644 --- a/client/serviceregistration/checks/client.go +++ b/client/serviceregistration/checks/client.go @@ -18,9 +18,9 @@ import ( "github.com/hashicorp/go-cleanhttp" "github.com/hashicorp/go-hclog" - "github.com/hashicorp/nomad/client/serviceregistration" - "github.com/hashicorp/nomad/helper/useragent" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/client/serviceregistration" + "github.com/hashicorp/nomad/v2/helper/useragent" + "github.com/hashicorp/nomad/v2/nomad/structs" "oss.indeed.com/go/libtime" ) diff --git a/client/serviceregistration/checks/client_test.go b/client/serviceregistration/checks/client_test.go index 4fc77efce78..6e650d14774 100644 --- a/client/serviceregistration/checks/client_test.go +++ b/client/serviceregistration/checks/client_test.go @@ -15,11 +15,11 @@ import ( "testing" "time" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/helper/testlog" - "github.com/hashicorp/nomad/helper/useragent" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/helper/testlog" + "github.com/hashicorp/nomad/v2/helper/useragent" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" "github.com/shoenig/test/must" "oss.indeed.com/go/libtime/libtimetest" ) diff --git a/client/serviceregistration/checks/result.go b/client/serviceregistration/checks/result.go index 9506b1c9e6f..2fff5afe72b 100644 --- a/client/serviceregistration/checks/result.go +++ b/client/serviceregistration/checks/result.go @@ -8,7 +8,7 @@ import ( "net/http" "time" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/nomad/structs" ) // GetCheckQuery extracts the needed info from c to actually execute the check. diff --git a/client/serviceregistration/checks/result_test.go b/client/serviceregistration/checks/result_test.go index 3b25e3b59ff..f096867afa5 100644 --- a/client/serviceregistration/checks/result_test.go +++ b/client/serviceregistration/checks/result_test.go @@ -7,7 +7,7 @@ import ( "testing" "time" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/nomad/structs" "github.com/shoenig/test/must" ) diff --git a/client/serviceregistration/id.go b/client/serviceregistration/id.go index 042fe4d8c5f..319383e1f54 100644 --- a/client/serviceregistration/id.go +++ b/client/serviceregistration/id.go @@ -6,7 +6,7 @@ package serviceregistration import ( "fmt" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/nomad/structs" ) const ( diff --git a/client/serviceregistration/id_test.go b/client/serviceregistration/id_test.go index 8d710a64dab..b83ea614380 100644 --- a/client/serviceregistration/id_test.go +++ b/client/serviceregistration/id_test.go @@ -6,7 +6,7 @@ package serviceregistration import ( "testing" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/nomad/structs" "github.com/stretchr/testify/require" ) diff --git a/client/serviceregistration/mock/mock.go b/client/serviceregistration/mock/mock.go index adfa78c9b44..42a1f6608a0 100644 --- a/client/serviceregistration/mock/mock.go +++ b/client/serviceregistration/mock/mock.go @@ -9,7 +9,7 @@ import ( "time" "github.com/hashicorp/go-hclog" - "github.com/hashicorp/nomad/client/serviceregistration" + "github.com/hashicorp/nomad/v2/client/serviceregistration" ) // Ensure that the mock handler implements the service registration handler diff --git a/client/serviceregistration/nsd/nsd.go b/client/serviceregistration/nsd/nsd.go index 29bf8cb3665..e0f06f0856a 100644 --- a/client/serviceregistration/nsd/nsd.go +++ b/client/serviceregistration/nsd/nsd.go @@ -14,8 +14,8 @@ import ( "github.com/hashicorp/go-hclog" "github.com/hashicorp/go-multierror" - "github.com/hashicorp/nomad/client/serviceregistration" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/client/serviceregistration" + "github.com/hashicorp/nomad/v2/nomad/structs" "oss.indeed.com/go/libtime/decay" ) diff --git a/client/serviceregistration/nsd/nsd_test.go b/client/serviceregistration/nsd/nsd_test.go index a22c95ba9fe..b76cbd78e8a 100644 --- a/client/serviceregistration/nsd/nsd_test.go +++ b/client/serviceregistration/nsd/nsd_test.go @@ -12,9 +12,9 @@ import ( "time" "github.com/hashicorp/go-hclog" - "github.com/hashicorp/nomad/client/serviceregistration" - "github.com/hashicorp/nomad/helper/testlog" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/client/serviceregistration" + "github.com/hashicorp/nomad/v2/helper/testlog" + "github.com/hashicorp/nomad/v2/nomad/structs" "github.com/shoenig/test" "github.com/shoenig/test/must" "github.com/stretchr/testify/assert" diff --git a/client/serviceregistration/nsd/statuses.go b/client/serviceregistration/nsd/statuses.go index fda3f9701ba..fbd2762c98a 100644 --- a/client/serviceregistration/nsd/statuses.go +++ b/client/serviceregistration/nsd/statuses.go @@ -4,7 +4,7 @@ package nsd import ( - "github.com/hashicorp/nomad/client/serviceregistration/checks/checkstore" + "github.com/hashicorp/nomad/v2/client/serviceregistration/checks/checkstore" ) func NewStatusGetter(shim checkstore.Shim) *StatusGetter { diff --git a/client/serviceregistration/nsd/statuses_test.go b/client/serviceregistration/nsd/statuses_test.go index dc346cc8d66..61aa517233e 100644 --- a/client/serviceregistration/nsd/statuses_test.go +++ b/client/serviceregistration/nsd/statuses_test.go @@ -6,13 +6,13 @@ package nsd import ( "testing" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/client/serviceregistration" - "github.com/hashicorp/nomad/client/serviceregistration/checks/checkstore" - "github.com/hashicorp/nomad/client/state" - "github.com/hashicorp/nomad/helper/testlog" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/client/serviceregistration" + "github.com/hashicorp/nomad/v2/client/serviceregistration/checks/checkstore" + "github.com/hashicorp/nomad/v2/client/state" + "github.com/hashicorp/nomad/v2/helper/testlog" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/nomad/structs" "github.com/shoenig/test/must" ) diff --git a/client/serviceregistration/service_registration.go b/client/serviceregistration/service_registration.go index 19cc8474bfd..f2371b326ff 100644 --- a/client/serviceregistration/service_registration.go +++ b/client/serviceregistration/service_registration.go @@ -8,7 +8,7 @@ import ( "maps" "github.com/hashicorp/consul/api" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/nomad/structs" ) // Handler is the interface the Nomad Client uses to register, update and diff --git a/client/serviceregistration/service_registration_test.go b/client/serviceregistration/service_registration_test.go index 364a5701dc8..6eb75dd8339 100644 --- a/client/serviceregistration/service_registration_test.go +++ b/client/serviceregistration/service_registration_test.go @@ -6,7 +6,7 @@ package serviceregistration import ( "testing" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/nomad/structs" "github.com/stretchr/testify/require" ) diff --git a/client/serviceregistration/watcher.go b/client/serviceregistration/watcher.go index 5b75e7a5133..b9c3c35abbc 100644 --- a/client/serviceregistration/watcher.go +++ b/client/serviceregistration/watcher.go @@ -10,8 +10,8 @@ import ( "github.com/hashicorp/go-hclog" "github.com/hashicorp/go-set/v3" - "github.com/hashicorp/nomad/helper" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/helper" + "github.com/hashicorp/nomad/v2/nomad/structs" ) // composite of allocID + taskName for uniqueness diff --git a/client/serviceregistration/watcher_test.go b/client/serviceregistration/watcher_test.go index e291f6f65b3..162790c88d0 100644 --- a/client/serviceregistration/watcher_test.go +++ b/client/serviceregistration/watcher_test.go @@ -10,10 +10,10 @@ import ( "testing" "time" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/helper/testlog" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/testutil" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/helper/testlog" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/testutil" "github.com/shoenig/test/must" ) diff --git a/client/serviceregistration/workload.go b/client/serviceregistration/workload.go index 224a54dbced..e64d68d339f 100644 --- a/client/serviceregistration/workload.go +++ b/client/serviceregistration/workload.go @@ -4,9 +4,9 @@ package serviceregistration import ( - "github.com/hashicorp/nomad/client/allocrunner/taskrunner/interfaces" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/plugins/drivers" + "github.com/hashicorp/nomad/v2/client/allocrunner/taskrunner/interfaces" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/plugins/drivers" ) // WorkloadServices describes services defined in either a Task or TaskGroup diff --git a/client/serviceregistration/workload_test.go b/client/serviceregistration/workload_test.go index 09d8e30a536..0db51482293 100644 --- a/client/serviceregistration/workload_test.go +++ b/client/serviceregistration/workload_test.go @@ -6,7 +6,7 @@ package serviceregistration import ( "testing" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/nomad/structs" "github.com/stretchr/testify/require" ) diff --git a/client/serviceregistration/wrapper/wrapper.go b/client/serviceregistration/wrapper/wrapper.go index c99dbe519dc..1c5be1f4ebf 100644 --- a/client/serviceregistration/wrapper/wrapper.go +++ b/client/serviceregistration/wrapper/wrapper.go @@ -7,8 +7,8 @@ import ( "fmt" "github.com/hashicorp/go-hclog" - "github.com/hashicorp/nomad/client/serviceregistration" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/client/serviceregistration" + "github.com/hashicorp/nomad/v2/nomad/structs" ) // HandlerWrapper is used to wrap service registration implementations of the diff --git a/client/serviceregistration/wrapper/wrapper_test.go b/client/serviceregistration/wrapper/wrapper_test.go index 527f7def7c4..8569821626a 100644 --- a/client/serviceregistration/wrapper/wrapper_test.go +++ b/client/serviceregistration/wrapper/wrapper_test.go @@ -7,9 +7,9 @@ import ( "testing" "github.com/hashicorp/go-hclog" - "github.com/hashicorp/nomad/client/serviceregistration" - regMock "github.com/hashicorp/nomad/client/serviceregistration/mock" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/client/serviceregistration" + regMock "github.com/hashicorp/nomad/v2/client/serviceregistration/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" "github.com/stretchr/testify/require" ) diff --git a/client/state/08types.go b/client/state/08types.go index f6eda63ef21..b4e9914f079 100644 --- a/client/state/08types.go +++ b/client/state/08types.go @@ -8,11 +8,11 @@ import ( "fmt" "strings" - "github.com/hashicorp/nomad/client/allocrunner/taskrunner/state" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/plugins/drivers" - pstructs "github.com/hashicorp/nomad/plugins/shared/structs" + "github.com/hashicorp/nomad/v2/client/allocrunner/taskrunner/state" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/plugins/drivers" + pstructs "github.com/hashicorp/nomad/v2/plugins/shared/structs" ) // allocRunnerMutableState08 is state that had to be written on each save as it diff --git a/client/state/12types.go b/client/state/12types.go index 2c278f5bbe3..98bbcc91bf3 100644 --- a/client/state/12types.go +++ b/client/state/12types.go @@ -3,7 +3,7 @@ package state -import "github.com/hashicorp/nomad/client/dynamicplugins" +import "github.com/hashicorp/nomad/v2/client/dynamicplugins" // RegistryState12 is the dynamic plugin registry state persisted // before 1.3.0. diff --git a/client/state/db_bolt.go b/client/state/db_bolt.go index fa186500c62..0d9f018a826 100644 --- a/client/state/db_bolt.go +++ b/client/state/db_bolt.go @@ -11,15 +11,15 @@ import ( "time" hclog "github.com/hashicorp/go-hclog" - arstate "github.com/hashicorp/nomad/client/allocrunner/state" - trstate "github.com/hashicorp/nomad/client/allocrunner/taskrunner/state" - dmstate "github.com/hashicorp/nomad/client/devicemanager/state" - "github.com/hashicorp/nomad/client/dynamicplugins" - driverstate "github.com/hashicorp/nomad/client/pluginmanager/drivermanager/state" - "github.com/hashicorp/nomad/client/serviceregistration/checks" - cstructs "github.com/hashicorp/nomad/client/structs" - "github.com/hashicorp/nomad/helper/boltdd" - "github.com/hashicorp/nomad/nomad/structs" + arstate "github.com/hashicorp/nomad/v2/client/allocrunner/state" + trstate "github.com/hashicorp/nomad/v2/client/allocrunner/taskrunner/state" + dmstate "github.com/hashicorp/nomad/v2/client/devicemanager/state" + "github.com/hashicorp/nomad/v2/client/dynamicplugins" + driverstate "github.com/hashicorp/nomad/v2/client/pluginmanager/drivermanager/state" + "github.com/hashicorp/nomad/v2/client/serviceregistration/checks" + cstructs "github.com/hashicorp/nomad/v2/client/structs" + "github.com/hashicorp/nomad/v2/helper/boltdd" + "github.com/hashicorp/nomad/v2/nomad/structs" "go.etcd.io/bbolt" ) diff --git a/client/state/db_error.go b/client/state/db_error.go index c97afdfb7cc..ba1973fbb1a 100644 --- a/client/state/db_error.go +++ b/client/state/db_error.go @@ -7,14 +7,14 @@ import ( "errors" "fmt" - arstate "github.com/hashicorp/nomad/client/allocrunner/state" - "github.com/hashicorp/nomad/client/allocrunner/taskrunner/state" - dmstate "github.com/hashicorp/nomad/client/devicemanager/state" - "github.com/hashicorp/nomad/client/dynamicplugins" - driverstate "github.com/hashicorp/nomad/client/pluginmanager/drivermanager/state" - "github.com/hashicorp/nomad/client/serviceregistration/checks" - cstructs "github.com/hashicorp/nomad/client/structs" - "github.com/hashicorp/nomad/nomad/structs" + arstate "github.com/hashicorp/nomad/v2/client/allocrunner/state" + "github.com/hashicorp/nomad/v2/client/allocrunner/taskrunner/state" + dmstate "github.com/hashicorp/nomad/v2/client/devicemanager/state" + "github.com/hashicorp/nomad/v2/client/dynamicplugins" + driverstate "github.com/hashicorp/nomad/v2/client/pluginmanager/drivermanager/state" + "github.com/hashicorp/nomad/v2/client/serviceregistration/checks" + cstructs "github.com/hashicorp/nomad/v2/client/structs" + "github.com/hashicorp/nomad/v2/nomad/structs" ) var _ StateDB = &ErrDB{} diff --git a/client/state/db_mem.go b/client/state/db_mem.go index 8565fb917b7..40a1f046fe2 100644 --- a/client/state/db_mem.go +++ b/client/state/db_mem.go @@ -9,14 +9,14 @@ import ( "sync/atomic" "github.com/hashicorp/go-hclog" - arstate "github.com/hashicorp/nomad/client/allocrunner/state" - "github.com/hashicorp/nomad/client/allocrunner/taskrunner/state" - dmstate "github.com/hashicorp/nomad/client/devicemanager/state" - "github.com/hashicorp/nomad/client/dynamicplugins" - driverstate "github.com/hashicorp/nomad/client/pluginmanager/drivermanager/state" - "github.com/hashicorp/nomad/client/serviceregistration/checks" - cstructs "github.com/hashicorp/nomad/client/structs" - "github.com/hashicorp/nomad/nomad/structs" + arstate "github.com/hashicorp/nomad/v2/client/allocrunner/state" + "github.com/hashicorp/nomad/v2/client/allocrunner/taskrunner/state" + dmstate "github.com/hashicorp/nomad/v2/client/devicemanager/state" + "github.com/hashicorp/nomad/v2/client/dynamicplugins" + driverstate "github.com/hashicorp/nomad/v2/client/pluginmanager/drivermanager/state" + "github.com/hashicorp/nomad/v2/client/serviceregistration/checks" + cstructs "github.com/hashicorp/nomad/v2/client/structs" + "github.com/hashicorp/nomad/v2/nomad/structs" ) // MemDB implements a StateDB that stores data in memory and should only be diff --git a/client/state/db_noop.go b/client/state/db_noop.go index 370b091447c..bacda90fa7a 100644 --- a/client/state/db_noop.go +++ b/client/state/db_noop.go @@ -4,14 +4,14 @@ package state import ( - arstate "github.com/hashicorp/nomad/client/allocrunner/state" - "github.com/hashicorp/nomad/client/allocrunner/taskrunner/state" - dmstate "github.com/hashicorp/nomad/client/devicemanager/state" - "github.com/hashicorp/nomad/client/dynamicplugins" - driverstate "github.com/hashicorp/nomad/client/pluginmanager/drivermanager/state" - "github.com/hashicorp/nomad/client/serviceregistration/checks" - cstructs "github.com/hashicorp/nomad/client/structs" - "github.com/hashicorp/nomad/nomad/structs" + arstate "github.com/hashicorp/nomad/v2/client/allocrunner/state" + "github.com/hashicorp/nomad/v2/client/allocrunner/taskrunner/state" + dmstate "github.com/hashicorp/nomad/v2/client/devicemanager/state" + "github.com/hashicorp/nomad/v2/client/dynamicplugins" + driverstate "github.com/hashicorp/nomad/v2/client/pluginmanager/drivermanager/state" + "github.com/hashicorp/nomad/v2/client/serviceregistration/checks" + cstructs "github.com/hashicorp/nomad/v2/client/structs" + "github.com/hashicorp/nomad/v2/nomad/structs" ) var _ StateDB = &NoopDB{} diff --git a/client/state/db_test.go b/client/state/db_test.go index 637a25aa11e..9f79da371d3 100644 --- a/client/state/db_test.go +++ b/client/state/db_test.go @@ -10,15 +10,15 @@ import ( "testing" "time" - "github.com/hashicorp/nomad/ci" - trstate "github.com/hashicorp/nomad/client/allocrunner/taskrunner/state" - dmstate "github.com/hashicorp/nomad/client/devicemanager/state" - "github.com/hashicorp/nomad/client/dynamicplugins" - driverstate "github.com/hashicorp/nomad/client/pluginmanager/drivermanager/state" - cstructs "github.com/hashicorp/nomad/client/structs" - "github.com/hashicorp/nomad/helper/testlog" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/ci" + trstate "github.com/hashicorp/nomad/v2/client/allocrunner/taskrunner/state" + dmstate "github.com/hashicorp/nomad/v2/client/devicemanager/state" + "github.com/hashicorp/nomad/v2/client/dynamicplugins" + driverstate "github.com/hashicorp/nomad/v2/client/pluginmanager/drivermanager/state" + cstructs "github.com/hashicorp/nomad/v2/client/structs" + "github.com/hashicorp/nomad/v2/helper/testlog" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" "github.com/kr/pretty" "github.com/shoenig/test/must" "github.com/stretchr/testify/require" diff --git a/client/state/interface.go b/client/state/interface.go index 46f5b3653bd..ff402a40626 100644 --- a/client/state/interface.go +++ b/client/state/interface.go @@ -4,14 +4,14 @@ package state import ( - arstate "github.com/hashicorp/nomad/client/allocrunner/state" - "github.com/hashicorp/nomad/client/allocrunner/taskrunner/state" - dmstate "github.com/hashicorp/nomad/client/devicemanager/state" - "github.com/hashicorp/nomad/client/dynamicplugins" - driverstate "github.com/hashicorp/nomad/client/pluginmanager/drivermanager/state" - "github.com/hashicorp/nomad/client/serviceregistration/checks" - cstructs "github.com/hashicorp/nomad/client/structs" - "github.com/hashicorp/nomad/nomad/structs" + arstate "github.com/hashicorp/nomad/v2/client/allocrunner/state" + "github.com/hashicorp/nomad/v2/client/allocrunner/taskrunner/state" + dmstate "github.com/hashicorp/nomad/v2/client/devicemanager/state" + "github.com/hashicorp/nomad/v2/client/dynamicplugins" + driverstate "github.com/hashicorp/nomad/v2/client/pluginmanager/drivermanager/state" + "github.com/hashicorp/nomad/v2/client/serviceregistration/checks" + cstructs "github.com/hashicorp/nomad/v2/client/structs" + "github.com/hashicorp/nomad/v2/nomad/structs" ) // StateDB implementations store and load Nomad client state. diff --git a/client/state/upgrade.go b/client/state/upgrade.go index 09a62258eac..a7612d1cd43 100644 --- a/client/state/upgrade.go +++ b/client/state/upgrade.go @@ -11,9 +11,9 @@ import ( hclog "github.com/hashicorp/go-hclog" "github.com/hashicorp/go-msgpack/v2/codec" - "github.com/hashicorp/nomad/client/dynamicplugins" - "github.com/hashicorp/nomad/helper/boltdd" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/client/dynamicplugins" + "github.com/hashicorp/nomad/v2/helper/boltdd" + "github.com/hashicorp/nomad/v2/nomad/structs" "go.etcd.io/bbolt" ) diff --git a/client/state/upgrade_int_test.go b/client/state/upgrade_int_test.go index 1228c332b4e..5e3400e883f 100644 --- a/client/state/upgrade_int_test.go +++ b/client/state/upgrade_int_test.go @@ -13,23 +13,23 @@ import ( "strings" "testing" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/client/allocrunner" - "github.com/hashicorp/nomad/client/allocwatcher" - "github.com/hashicorp/nomad/client/config" - clientconfig "github.com/hashicorp/nomad/client/config" - "github.com/hashicorp/nomad/client/devicemanager" - dmstate "github.com/hashicorp/nomad/client/devicemanager/state" - "github.com/hashicorp/nomad/client/lib/cgroupslib" - "github.com/hashicorp/nomad/client/lib/proclib" - "github.com/hashicorp/nomad/client/pluginmanager/drivermanager" - regMock "github.com/hashicorp/nomad/client/serviceregistration/mock" - . "github.com/hashicorp/nomad/client/state" - "github.com/hashicorp/nomad/client/vaultclient" - "github.com/hashicorp/nomad/helper/boltdd" - "github.com/hashicorp/nomad/helper/testlog" - "github.com/hashicorp/nomad/nomad/structs" - pstructs "github.com/hashicorp/nomad/plugins/shared/structs" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/client/allocrunner" + "github.com/hashicorp/nomad/v2/client/allocwatcher" + "github.com/hashicorp/nomad/v2/client/config" + clientconfig "github.com/hashicorp/nomad/v2/client/config" + "github.com/hashicorp/nomad/v2/client/devicemanager" + dmstate "github.com/hashicorp/nomad/v2/client/devicemanager/state" + "github.com/hashicorp/nomad/v2/client/lib/cgroupslib" + "github.com/hashicorp/nomad/v2/client/lib/proclib" + "github.com/hashicorp/nomad/v2/client/pluginmanager/drivermanager" + regMock "github.com/hashicorp/nomad/v2/client/serviceregistration/mock" + . "github.com/hashicorp/nomad/v2/client/state" + "github.com/hashicorp/nomad/v2/client/vaultclient" + "github.com/hashicorp/nomad/v2/helper/boltdd" + "github.com/hashicorp/nomad/v2/helper/testlog" + "github.com/hashicorp/nomad/v2/nomad/structs" + pstructs "github.com/hashicorp/nomad/v2/plugins/shared/structs" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.etcd.io/bbolt" diff --git a/client/state/upgrade_test.go b/client/state/upgrade_test.go index b4146ffe945..0ba6ad86f1c 100644 --- a/client/state/upgrade_test.go +++ b/client/state/upgrade_test.go @@ -8,10 +8,10 @@ import ( "path/filepath" "testing" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/helper/boltdd" - "github.com/hashicorp/nomad/helper/testlog" - "github.com/hashicorp/nomad/helper/uuid" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/helper/boltdd" + "github.com/hashicorp/nomad/v2/helper/testlog" + "github.com/hashicorp/nomad/v2/helper/uuid" "github.com/stretchr/testify/require" "go.etcd.io/bbolt" ) diff --git a/client/structs/allochook.go b/client/structs/allochook.go index 901e572f205..2c6bb4615af 100644 --- a/client/structs/allochook.go +++ b/client/structs/allochook.go @@ -7,9 +7,9 @@ import ( "sync" consulapi "github.com/hashicorp/consul/api" - "github.com/hashicorp/nomad/client/pluginmanager/csimanager" - "github.com/hashicorp/nomad/helper" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/client/pluginmanager/csimanager" + "github.com/hashicorp/nomad/v2/helper" + "github.com/hashicorp/nomad/v2/nomad/structs" ) // AllocHookResources contains data that is provided by AllocRunner Hooks for diff --git a/client/structs/broadcaster.go b/client/structs/broadcaster.go index 5c876337cdd..7cfe5f8dad1 100644 --- a/client/structs/broadcaster.go +++ b/client/structs/broadcaster.go @@ -8,7 +8,7 @@ import ( "sync" "github.com/hashicorp/go-hclog" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/nomad/structs" ) const ( diff --git a/client/structs/broadcaster_test.go b/client/structs/broadcaster_test.go index 72de68e1983..c4f24f9741d 100644 --- a/client/structs/broadcaster_test.go +++ b/client/structs/broadcaster_test.go @@ -8,9 +8,9 @@ import ( "testing" "time" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/helper/testlog" - "github.com/hashicorp/nomad/nomad/mock" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/helper/testlog" + "github.com/hashicorp/nomad/v2/nomad/mock" "github.com/stretchr/testify/require" ) diff --git a/client/structs/csi.go b/client/structs/csi.go index 9c1a3bf3164..238d8564856 100644 --- a/client/structs/csi.go +++ b/client/structs/csi.go @@ -6,8 +6,8 @@ package structs import ( "errors" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/plugins/csi" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/plugins/csi" ) // CSIVolumeMountOptions contains the mount options that should be provided when diff --git a/client/structs/csi_test.go b/client/structs/csi_test.go index 8f6b5cde5ef..f72e84aa1eb 100644 --- a/client/structs/csi_test.go +++ b/client/structs/csi_test.go @@ -8,7 +8,7 @@ import ( "github.com/shoenig/test/must" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/nomad/structs" ) func TestClientCSINodeExpandVolumeRequest_Validate(t *testing.T) { diff --git a/client/structs/structs.go b/client/structs/structs.go index 090428b10f5..fef9f34dc80 100644 --- a/client/structs/structs.go +++ b/client/structs/structs.go @@ -9,9 +9,9 @@ import ( "errors" "time" - "github.com/hashicorp/nomad/client/hoststats" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/plugins/device" + "github.com/hashicorp/nomad/v2/client/hoststats" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/plugins/device" ) // RpcError is used for serializing errors with a potential error code diff --git a/client/taskenv/env.go b/client/taskenv/env.go index d2933d1de2f..65b18b6aa85 100644 --- a/client/taskenv/env.go +++ b/client/taskenv/env.go @@ -13,12 +13,12 @@ import ( "strings" "sync" - "github.com/hashicorp/nomad/client/lib/idset" - "github.com/hashicorp/nomad/helper" - hargs "github.com/hashicorp/nomad/helper/args" - "github.com/hashicorp/nomad/helper/escapingfs" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/plugins/drivers" + "github.com/hashicorp/nomad/v2/client/lib/idset" + "github.com/hashicorp/nomad/v2/helper" + hargs "github.com/hashicorp/nomad/v2/helper/args" + "github.com/hashicorp/nomad/v2/helper/escapingfs" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/plugins/drivers" "github.com/zclconf/go-cty/cty" ) diff --git a/client/taskenv/env_test.go b/client/taskenv/env_test.go index 527ddf0df69..c8b1a3b800f 100644 --- a/client/taskenv/env_test.go +++ b/client/taskenv/env_test.go @@ -14,11 +14,11 @@ import ( hcl "github.com/hashicorp/hcl/v2" "github.com/hashicorp/hcl/v2/gohcl" "github.com/hashicorp/hcl/v2/hclsyntax" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/plugins/drivers" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/plugins/drivers" "github.com/shoenig/test" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/client/taskenv/network.go b/client/taskenv/network.go index 23e86e433f3..b7e3b3290de 100644 --- a/client/taskenv/network.go +++ b/client/taskenv/network.go @@ -4,7 +4,7 @@ package taskenv import ( - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/nomad/structs" ) // InterpolateNetworks returns an interpolated copy of the task group networks diff --git a/client/taskenv/network_test.go b/client/taskenv/network_test.go index c7f475b227e..82b2b2128ae 100644 --- a/client/taskenv/network_test.go +++ b/client/taskenv/network_test.go @@ -6,8 +6,8 @@ package taskenv import ( "testing" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/nomad/structs" "github.com/stretchr/testify/assert" ) diff --git a/client/taskenv/services.go b/client/taskenv/services.go index 932e14c46e2..630e018c844 100644 --- a/client/taskenv/services.go +++ b/client/taskenv/services.go @@ -4,7 +4,7 @@ package taskenv import ( - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/nomad/structs" ) // InterpolateServices returns an interpolated copy of services and checks with diff --git a/client/taskenv/services_test.go b/client/taskenv/services_test.go index 092b67a4b83..ca9c07218af 100644 --- a/client/taskenv/services_test.go +++ b/client/taskenv/services_test.go @@ -7,8 +7,8 @@ import ( "testing" "time" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/nomad/structs" "github.com/stretchr/testify/require" ) diff --git a/client/taskenv/util_test.go b/client/taskenv/util_test.go index 834392f14ae..256ab4fc392 100644 --- a/client/taskenv/util_test.go +++ b/client/taskenv/util_test.go @@ -7,7 +7,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/nomad/ci" + "github.com/hashicorp/nomad/v2/ci" "github.com/stretchr/testify/require" "github.com/zclconf/go-cty/cty" ) diff --git a/client/testing.go b/client/testing.go index 269484cce16..2980893f1fc 100644 --- a/client/testing.go +++ b/client/testing.go @@ -10,16 +10,16 @@ import ( "testing" "time" - "github.com/hashicorp/nomad/client/config" - "github.com/hashicorp/nomad/client/fingerprint" - "github.com/hashicorp/nomad/client/servers" - "github.com/hashicorp/nomad/client/serviceregistration/mock" - "github.com/hashicorp/nomad/client/state" - agentconsul "github.com/hashicorp/nomad/command/agent/consul" - "github.com/hashicorp/nomad/helper/pluginutils/catalog" - "github.com/hashicorp/nomad/helper/pluginutils/singleton" - "github.com/hashicorp/nomad/helper/pool" - "github.com/hashicorp/nomad/helper/testlog" + "github.com/hashicorp/nomad/v2/client/config" + "github.com/hashicorp/nomad/v2/client/fingerprint" + "github.com/hashicorp/nomad/v2/client/servers" + "github.com/hashicorp/nomad/v2/client/serviceregistration/mock" + "github.com/hashicorp/nomad/v2/client/state" + agentconsul "github.com/hashicorp/nomad/v2/command/agent/consul" + "github.com/hashicorp/nomad/v2/helper/pluginutils/catalog" + "github.com/hashicorp/nomad/v2/helper/pluginutils/singleton" + "github.com/hashicorp/nomad/v2/helper/pool" + "github.com/hashicorp/nomad/v2/helper/testlog" "github.com/hashicorp/yamux" "github.com/shoenig/test/must" ) diff --git a/client/testutil/docker.go b/client/testutil/docker.go index c263f48e19e..076226bbc59 100644 --- a/client/testutil/docker.go +++ b/client/testutil/docker.go @@ -7,7 +7,7 @@ import ( "runtime" "testing" - "github.com/hashicorp/nomad/testutil" + "github.com/hashicorp/nomad/v2/testutil" docker "github.com/moby/moby/client" ) diff --git a/client/testutil/rpc.go b/client/testutil/rpc.go index 7da84bfaf3e..a399a352815 100644 --- a/client/testutil/rpc.go +++ b/client/testutil/rpc.go @@ -12,8 +12,8 @@ import ( "time" "github.com/hashicorp/go-msgpack/v2/codec" - cstructs "github.com/hashicorp/nomad/client/structs" - "github.com/hashicorp/nomad/nomad/structs" + cstructs "github.com/hashicorp/nomad/v2/client/structs" + "github.com/hashicorp/nomad/v2/nomad/structs" "github.com/stretchr/testify/require" ) diff --git a/client/util.go b/client/util.go index a760bbd1b09..a97d97681e2 100644 --- a/client/util.go +++ b/client/util.go @@ -8,7 +8,7 @@ import ( "math/rand" "time" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/nomad/structs" ) // diffResult is used to return the sets that result from a diff diff --git a/client/vaultclient/vaultclient.go b/client/vaultclient/vaultclient.go index ffb37c8bc30..e5dcbd84910 100644 --- a/client/vaultclient/vaultclient.go +++ b/client/vaultclient/vaultclient.go @@ -15,8 +15,8 @@ import ( hclog "github.com/hashicorp/go-hclog" metrics "github.com/hashicorp/go-metrics/compat" - "github.com/hashicorp/nomad/helper/useragent" - "github.com/hashicorp/nomad/nomad/structs/config" + "github.com/hashicorp/nomad/v2/helper/useragent" + "github.com/hashicorp/nomad/v2/nomad/structs/config" vaultapi "github.com/hashicorp/vault/api" ) diff --git a/client/vaultclient/vaultclient_test.go b/client/vaultclient/vaultclient_test.go index 4ca47e66e7a..85cfd0d65ac 100644 --- a/client/vaultclient/vaultclient_test.go +++ b/client/vaultclient/vaultclient_test.go @@ -17,16 +17,16 @@ import ( "time" josejwt "github.com/go-jose/go-jose/v3/jwt" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/client/widmgr" - "github.com/hashicorp/nomad/helper" - "github.com/hashicorp/nomad/helper/testlog" - "github.com/hashicorp/nomad/helper/useragent" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" - structsc "github.com/hashicorp/nomad/nomad/structs/config" - "github.com/hashicorp/nomad/testutil" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/client/widmgr" + "github.com/hashicorp/nomad/v2/helper" + "github.com/hashicorp/nomad/v2/helper/testlog" + "github.com/hashicorp/nomad/v2/helper/useragent" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" + structsc "github.com/hashicorp/nomad/v2/nomad/structs/config" + "github.com/hashicorp/nomad/v2/testutil" "github.com/hashicorp/vault/api" vaultapi "github.com/hashicorp/vault/api" "github.com/shoenig/test/must" diff --git a/client/vaultclient/vaultclient_testing.go b/client/vaultclient/vaultclient_testing.go index 543daf8fe22..a04e46ee7cf 100644 --- a/client/vaultclient/vaultclient_testing.go +++ b/client/vaultclient/vaultclient_testing.go @@ -8,7 +8,7 @@ import ( "fmt" "sync" - "github.com/hashicorp/nomad/helper/uuid" + "github.com/hashicorp/nomad/v2/helper/uuid" ) // MockVaultClient is used for testing the vaultclient integration and is safe diff --git a/client/widmgr/mock.go b/client/widmgr/mock.go index fb588e9980d..045db5f6c5e 100644 --- a/client/widmgr/mock.go +++ b/client/widmgr/mock.go @@ -13,8 +13,8 @@ import ( "github.com/go-jose/go-jose/v3" "github.com/go-jose/go-jose/v3/jwt" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/nomad/structs" ) // MockWIDSigner allows TaskRunner unit tests to avoid having to setup a Server, diff --git a/client/widmgr/signer.go b/client/widmgr/signer.go index 7d5c3f15d73..08ca12a6857 100644 --- a/client/widmgr/signer.go +++ b/client/widmgr/signer.go @@ -8,7 +8,7 @@ import ( "sync/atomic" "github.com/hashicorp/go-multierror" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/nomad/structs" ) type RPCer interface { diff --git a/client/widmgr/widmgr.go b/client/widmgr/widmgr.go index 93bdb73a130..6b3dff368d8 100644 --- a/client/widmgr/widmgr.go +++ b/client/widmgr/widmgr.go @@ -11,10 +11,10 @@ import ( "time" "github.com/hashicorp/go-hclog" - cstate "github.com/hashicorp/nomad/client/state" - "github.com/hashicorp/nomad/client/taskenv" - "github.com/hashicorp/nomad/helper" - "github.com/hashicorp/nomad/nomad/structs" + cstate "github.com/hashicorp/nomad/v2/client/state" + "github.com/hashicorp/nomad/v2/client/taskenv" + "github.com/hashicorp/nomad/v2/helper" + "github.com/hashicorp/nomad/v2/nomad/structs" ) // IdentityManager defines a manager responsible for signing and renewing diff --git a/client/widmgr/widmgr_int_test.go b/client/widmgr/widmgr_int_test.go index ad2e6b97b6e..2b4c303ae95 100644 --- a/client/widmgr/widmgr_int_test.go +++ b/client/widmgr/widmgr_int_test.go @@ -7,13 +7,13 @@ import ( "fmt" "testing" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/client/widmgr" - "github.com/hashicorp/nomad/command/agent" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/testutil" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/client/widmgr" + "github.com/hashicorp/nomad/v2/command/agent" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/testutil" "github.com/shoenig/test/must" ) diff --git a/client/widmgr/widmgr_test.go b/client/widmgr/widmgr_test.go index 269a82e1e43..362c5e6b483 100644 --- a/client/widmgr/widmgr_test.go +++ b/client/widmgr/widmgr_test.go @@ -7,11 +7,11 @@ import ( "testing" "time" - cstate "github.com/hashicorp/nomad/client/state" - "github.com/hashicorp/nomad/client/taskenv" - "github.com/hashicorp/nomad/helper/testlog" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" + cstate "github.com/hashicorp/nomad/v2/client/state" + "github.com/hashicorp/nomad/v2/client/taskenv" + "github.com/hashicorp/nomad/v2/helper/testlog" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" "github.com/shoenig/test/must" ) diff --git a/command/acl_auth_method_create_test.go b/command/acl_auth_method_create_test.go index 01c96fe6552..22c38537892 100644 --- a/command/acl_auth_method_create_test.go +++ b/command/acl_auth_method_create_test.go @@ -10,9 +10,9 @@ import ( "testing" "github.com/hashicorp/cli" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/command/agent" - "github.com/hashicorp/nomad/testutil" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/command/agent" + "github.com/hashicorp/nomad/v2/testutil" "github.com/shoenig/test" "github.com/shoenig/test/must" ) diff --git a/command/acl_auth_method_delete_test.go b/command/acl_auth_method_delete_test.go index 7c44c9dd71f..a4dfb9fbddb 100644 --- a/command/acl_auth_method_delete_test.go +++ b/command/acl_auth_method_delete_test.go @@ -8,10 +8,10 @@ import ( "testing" "github.com/hashicorp/cli" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/command/agent" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/command/agent" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" "github.com/shoenig/test/must" ) diff --git a/command/acl_auth_method_info_test.go b/command/acl_auth_method_info_test.go index 1fd97d3e513..6369a9fa644 100644 --- a/command/acl_auth_method_info_test.go +++ b/command/acl_auth_method_info_test.go @@ -7,10 +7,10 @@ import ( "testing" "github.com/hashicorp/cli" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/command/agent" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/command/agent" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" "github.com/shoenig/test/must" ) diff --git a/command/acl_auth_method_list_test.go b/command/acl_auth_method_list_test.go index ed355639613..a26d3f0dca9 100644 --- a/command/acl_auth_method_list_test.go +++ b/command/acl_auth_method_list_test.go @@ -7,10 +7,10 @@ import ( "testing" "github.com/hashicorp/cli" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/command/agent" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/command/agent" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" "github.com/shoenig/test/must" ) diff --git a/command/acl_auth_method_update_test.go b/command/acl_auth_method_update_test.go index 7f48b14cb76..331f2e675ea 100644 --- a/command/acl_auth_method_update_test.go +++ b/command/acl_auth_method_update_test.go @@ -11,10 +11,10 @@ import ( "time" "github.com/hashicorp/cli" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/command/agent" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/testutil" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/command/agent" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/testutil" "github.com/shoenig/test" "github.com/shoenig/test/must" ) diff --git a/command/acl_binding_rule.go b/command/acl_binding_rule.go index ab078d05ed3..07f0020ada0 100644 --- a/command/acl_binding_rule.go +++ b/command/acl_binding_rule.go @@ -9,7 +9,7 @@ import ( "github.com/hashicorp/cli" "github.com/hashicorp/nomad/api" - "github.com/hashicorp/nomad/helper" + "github.com/hashicorp/nomad/v2/helper" "github.com/posener/complete" ) diff --git a/command/acl_binding_rule_create_test.go b/command/acl_binding_rule_create_test.go index 3be829277f6..a890de68900 100644 --- a/command/acl_binding_rule_create_test.go +++ b/command/acl_binding_rule_create_test.go @@ -8,10 +8,10 @@ import ( "time" "github.com/hashicorp/cli" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/command/agent" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/testutil" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/command/agent" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/testutil" "github.com/shoenig/test/must" ) diff --git a/command/acl_binding_rule_delete_test.go b/command/acl_binding_rule_delete_test.go index 7903f9c3798..fd3de2d2a70 100644 --- a/command/acl_binding_rule_delete_test.go +++ b/command/acl_binding_rule_delete_test.go @@ -7,11 +7,11 @@ import ( "testing" "github.com/hashicorp/cli" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/command/agent" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/testutil" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/command/agent" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/testutil" "github.com/shoenig/test/must" ) diff --git a/command/acl_binding_rule_info_test.go b/command/acl_binding_rule_info_test.go index e07a4fce023..bdd1e5e8a17 100644 --- a/command/acl_binding_rule_info_test.go +++ b/command/acl_binding_rule_info_test.go @@ -8,11 +8,11 @@ import ( "testing" "github.com/hashicorp/cli" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/command/agent" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/testutil" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/command/agent" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/testutil" "github.com/shoenig/test/must" ) diff --git a/command/acl_binding_rule_list_test.go b/command/acl_binding_rule_list_test.go index 5a2f1e60eca..74eaa7201d9 100644 --- a/command/acl_binding_rule_list_test.go +++ b/command/acl_binding_rule_list_test.go @@ -7,11 +7,11 @@ import ( "testing" "github.com/hashicorp/cli" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/command/agent" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/testutil" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/command/agent" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/testutil" "github.com/shoenig/test/must" ) diff --git a/command/acl_binding_rule_update_test.go b/command/acl_binding_rule_update_test.go index ee8bca83d58..4d568707fee 100644 --- a/command/acl_binding_rule_update_test.go +++ b/command/acl_binding_rule_update_test.go @@ -8,11 +8,11 @@ import ( "time" "github.com/hashicorp/cli" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/command/agent" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/testutil" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/command/agent" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/testutil" "github.com/shoenig/test/must" ) diff --git a/command/acl_bootstrap_test.go b/command/acl_bootstrap_test.go index ad03f9271d1..eb33ebb6cf0 100644 --- a/command/acl_bootstrap_test.go +++ b/command/acl_bootstrap_test.go @@ -8,9 +8,9 @@ import ( "testing" "github.com/hashicorp/cli" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/command/agent" - "github.com/hashicorp/nomad/nomad/mock" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/command/agent" + "github.com/hashicorp/nomad/v2/nomad/mock" "github.com/shoenig/test/must" ) diff --git a/command/acl_policy.go b/command/acl_policy.go index 3e8870992fc..cea2b4c01e7 100644 --- a/command/acl_policy.go +++ b/command/acl_policy.go @@ -8,7 +8,7 @@ import ( "github.com/hashicorp/cli" "github.com/hashicorp/nomad/api" - "github.com/hashicorp/nomad/helper" + "github.com/hashicorp/nomad/v2/helper" "github.com/posener/complete" ) diff --git a/command/acl_policy_apply_test.go b/command/acl_policy_apply_test.go index 3c968995538..2fe8dcc1431 100644 --- a/command/acl_policy_apply_test.go +++ b/command/acl_policy_apply_test.go @@ -8,9 +8,9 @@ import ( "testing" "github.com/hashicorp/cli" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/command/agent" - "github.com/hashicorp/nomad/nomad/mock" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/command/agent" + "github.com/hashicorp/nomad/v2/nomad/mock" "github.com/shoenig/test/must" ) diff --git a/command/acl_policy_delete_test.go b/command/acl_policy_delete_test.go index bb8363d7fef..d414e0db03f 100644 --- a/command/acl_policy_delete_test.go +++ b/command/acl_policy_delete_test.go @@ -8,11 +8,11 @@ import ( "testing" "github.com/hashicorp/cli" - "github.com/hashicorp/nomad/acl" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/command/agent" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/acl" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/command/agent" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" "github.com/shoenig/test/must" ) diff --git a/command/acl_policy_info_test.go b/command/acl_policy_info_test.go index 57898c0c18f..25c507ce758 100644 --- a/command/acl_policy_info_test.go +++ b/command/acl_policy_info_test.go @@ -7,10 +7,10 @@ import ( "testing" "github.com/hashicorp/cli" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/command/agent" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/command/agent" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" "github.com/shoenig/test/must" ) diff --git a/command/acl_policy_list_test.go b/command/acl_policy_list_test.go index 2354479e6a9..df225fc321a 100644 --- a/command/acl_policy_list_test.go +++ b/command/acl_policy_list_test.go @@ -7,11 +7,11 @@ import ( "testing" "github.com/hashicorp/cli" - "github.com/hashicorp/nomad/acl" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/command/agent" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/acl" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/command/agent" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" "github.com/shoenig/test/must" ) diff --git a/command/acl_policy_self_test.go b/command/acl_policy_self_test.go index e27927abfc9..bc0f186e885 100644 --- a/command/acl_policy_self_test.go +++ b/command/acl_policy_self_test.go @@ -7,9 +7,9 @@ import ( "testing" "github.com/hashicorp/cli" - "github.com/hashicorp/nomad/command/agent" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/command/agent" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" "github.com/shoenig/test/must" ) diff --git a/command/acl_role.go b/command/acl_role.go index 720b748655d..e3fde2298b2 100644 --- a/command/acl_role.go +++ b/command/acl_role.go @@ -10,7 +10,7 @@ import ( "github.com/hashicorp/cli" "github.com/hashicorp/nomad/api" - "github.com/hashicorp/nomad/helper" + "github.com/hashicorp/nomad/v2/helper" "github.com/posener/complete" ) diff --git a/command/acl_role_create_test.go b/command/acl_role_create_test.go index 859b94c16e0..b0e35c0b7aa 100644 --- a/command/acl_role_create_test.go +++ b/command/acl_role_create_test.go @@ -7,10 +7,10 @@ import ( "testing" "github.com/hashicorp/cli" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/command/agent" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/testutil" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/command/agent" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/testutil" "github.com/shoenig/test/must" ) diff --git a/command/acl_role_delete_test.go b/command/acl_role_delete_test.go index 04a578837f9..0b1e99209da 100644 --- a/command/acl_role_delete_test.go +++ b/command/acl_role_delete_test.go @@ -7,11 +7,11 @@ import ( "testing" "github.com/hashicorp/cli" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/command/agent" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/testutil" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/command/agent" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/testutil" "github.com/shoenig/test/must" ) diff --git a/command/acl_role_info_test.go b/command/acl_role_info_test.go index 508c92e01fb..46a634d2a59 100644 --- a/command/acl_role_info_test.go +++ b/command/acl_role_info_test.go @@ -8,11 +8,11 @@ import ( "testing" "github.com/hashicorp/cli" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/command/agent" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/testutil" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/command/agent" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/testutil" "github.com/shoenig/test/must" ) diff --git a/command/acl_role_list_test.go b/command/acl_role_list_test.go index f0d3b941a14..e36be4e9f01 100644 --- a/command/acl_role_list_test.go +++ b/command/acl_role_list_test.go @@ -7,11 +7,11 @@ import ( "testing" "github.com/hashicorp/cli" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/command/agent" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/testutil" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/command/agent" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/testutil" "github.com/shoenig/test/must" ) diff --git a/command/acl_role_update_test.go b/command/acl_role_update_test.go index df3cb65429c..e364cc84eaf 100644 --- a/command/acl_role_update_test.go +++ b/command/acl_role_update_test.go @@ -8,11 +8,11 @@ import ( "testing" "github.com/hashicorp/cli" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/command/agent" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/testutil" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/command/agent" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/testutil" "github.com/shoenig/test/must" ) diff --git a/command/acl_token.go b/command/acl_token.go index 35e7c2e4514..6b4c5bb2524 100644 --- a/command/acl_token.go +++ b/command/acl_token.go @@ -8,7 +8,7 @@ import ( "github.com/hashicorp/cli" "github.com/hashicorp/nomad/api" - "github.com/hashicorp/nomad/helper" + "github.com/hashicorp/nomad/v2/helper" "github.com/posener/complete" ) diff --git a/command/acl_token_create.go b/command/acl_token_create.go index f12aa9f9db3..cab81657ce4 100644 --- a/command/acl_token_create.go +++ b/command/acl_token_create.go @@ -12,7 +12,7 @@ import ( "github.com/hashicorp/go-set/v3" "github.com/hashicorp/nomad/api" - "github.com/hashicorp/nomad/helper" + "github.com/hashicorp/nomad/v2/helper" "github.com/posener/complete" ) diff --git a/command/acl_token_create_test.go b/command/acl_token_create_test.go index d87c98f6fae..98375265b07 100644 --- a/command/acl_token_create_test.go +++ b/command/acl_token_create_test.go @@ -10,8 +10,8 @@ import ( "github.com/hashicorp/cli" "github.com/hashicorp/nomad/api" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/command/agent" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/command/agent" "github.com/shoenig/test/must" ) diff --git a/command/acl_token_delete_test.go b/command/acl_token_delete_test.go index 90ecf8b76e5..45a380f1881 100644 --- a/command/acl_token_delete_test.go +++ b/command/acl_token_delete_test.go @@ -8,11 +8,11 @@ import ( "testing" "github.com/hashicorp/cli" - "github.com/hashicorp/nomad/acl" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/command/agent" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/acl" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/command/agent" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" "github.com/shoenig/test/must" ) diff --git a/command/acl_token_info_test.go b/command/acl_token_info_test.go index 9280be40b20..27999a214c4 100644 --- a/command/acl_token_info_test.go +++ b/command/acl_token_info_test.go @@ -7,10 +7,10 @@ import ( "testing" "github.com/hashicorp/cli" - "github.com/hashicorp/nomad/acl" - "github.com/hashicorp/nomad/command/agent" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/acl" + "github.com/hashicorp/nomad/v2/command/agent" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" "github.com/shoenig/test/must" ) diff --git a/command/acl_token_list_test.go b/command/acl_token_list_test.go index 43fa8f50716..2379260b0ed 100644 --- a/command/acl_token_list_test.go +++ b/command/acl_token_list_test.go @@ -7,11 +7,11 @@ import ( "testing" "github.com/hashicorp/cli" - "github.com/hashicorp/nomad/acl" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/command/agent" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/acl" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/command/agent" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" "github.com/shoenig/test/must" ) diff --git a/command/acl_token_self.go b/command/acl_token_self.go index d8681de86a6..f810ccd235f 100644 --- a/command/acl_token_self.go +++ b/command/acl_token_self.go @@ -8,7 +8,7 @@ import ( "os" "strings" - "github.com/hashicorp/nomad/helper" + "github.com/hashicorp/nomad/v2/helper" "github.com/posener/complete" ) diff --git a/command/acl_token_self_test.go b/command/acl_token_self_test.go index a1e7cca591f..69b2a19af83 100644 --- a/command/acl_token_self_test.go +++ b/command/acl_token_self_test.go @@ -7,10 +7,10 @@ import ( "testing" "github.com/hashicorp/cli" - "github.com/hashicorp/nomad/acl" - "github.com/hashicorp/nomad/command/agent" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/acl" + "github.com/hashicorp/nomad/v2/command/agent" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" "github.com/shoenig/test/must" ) diff --git a/command/acl_token_update_test.go b/command/acl_token_update_test.go index 469cfe83055..9dc055bce4a 100644 --- a/command/acl_token_update_test.go +++ b/command/acl_token_update_test.go @@ -7,11 +7,11 @@ import ( "testing" "github.com/hashicorp/cli" - "github.com/hashicorp/nomad/acl" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/command/agent" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/acl" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/command/agent" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" "github.com/shoenig/test/must" ) diff --git a/command/agent/acl_endpoint.go b/command/agent/acl_endpoint.go index 689f2336b14..d92e8dc6aa2 100644 --- a/command/agent/acl_endpoint.go +++ b/command/agent/acl_endpoint.go @@ -8,8 +8,8 @@ import ( "net/http" "strings" - "github.com/hashicorp/nomad/helper" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/helper" + "github.com/hashicorp/nomad/v2/nomad/structs" ) func (s *HTTPServer) ACLPoliciesRequest(resp http.ResponseWriter, req *http.Request) (interface{}, error) { diff --git a/command/agent/acl_endpoint_test.go b/command/agent/acl_endpoint_test.go index 9dd4e32920f..5b71003bc59 100644 --- a/command/agent/acl_endpoint_test.go +++ b/command/agent/acl_endpoint_test.go @@ -14,11 +14,11 @@ import ( "github.com/golang-jwt/jwt/v5" capOIDC "github.com/hashicorp/cap/oidc" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/testutil" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/testutil" "github.com/shoenig/test/must" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/command/agent/agent.go b/command/agent/agent.go index e1bc060c982..b5c0c27b87c 100644 --- a/command/agent/agent.go +++ b/command/agent/agent.go @@ -22,23 +22,23 @@ import ( log "github.com/hashicorp/go-hclog" metrics "github.com/hashicorp/go-metrics/compat" uuidparse "github.com/hashicorp/go-uuid" - "github.com/hashicorp/nomad/client" - clientconfig "github.com/hashicorp/nomad/client/config" - clientconsul "github.com/hashicorp/nomad/client/consul" - "github.com/hashicorp/nomad/client/lib/idset" - "github.com/hashicorp/nomad/client/lib/numalib/hw" - "github.com/hashicorp/nomad/client/state" - "github.com/hashicorp/nomad/command/agent/consul" - "github.com/hashicorp/nomad/command/agent/event" - "github.com/hashicorp/nomad/helper" - "github.com/hashicorp/nomad/helper/bufconndialer" - "github.com/hashicorp/nomad/helper/escapingfs" - "github.com/hashicorp/nomad/helper/pluginutils/loader" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/nomad" - "github.com/hashicorp/nomad/nomad/deploymentwatcher" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/nomad/structs/config" + "github.com/hashicorp/nomad/v2/client" + clientconfig "github.com/hashicorp/nomad/v2/client/config" + clientconsul "github.com/hashicorp/nomad/v2/client/consul" + "github.com/hashicorp/nomad/v2/client/lib/idset" + "github.com/hashicorp/nomad/v2/client/lib/numalib/hw" + "github.com/hashicorp/nomad/v2/client/state" + "github.com/hashicorp/nomad/v2/command/agent/consul" + "github.com/hashicorp/nomad/v2/command/agent/event" + "github.com/hashicorp/nomad/v2/helper" + "github.com/hashicorp/nomad/v2/helper/bufconndialer" + "github.com/hashicorp/nomad/v2/helper/escapingfs" + "github.com/hashicorp/nomad/v2/helper/pluginutils/loader" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/nomad" + "github.com/hashicorp/nomad/v2/nomad/deploymentwatcher" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/nomad/structs/config" "github.com/hashicorp/raft" raftwal "github.com/hashicorp/raft-wal" "github.com/hashicorp/yamux" diff --git a/command/agent/agent_ce.go b/command/agent/agent_ce.go index b3fb8455c1e..0744f5f8201 100644 --- a/command/agent/agent_ce.go +++ b/command/agent/agent_ce.go @@ -8,7 +8,7 @@ package agent import ( hclog "github.com/hashicorp/go-hclog" - "github.com/hashicorp/nomad/nomad/structs/config" + "github.com/hashicorp/nomad/v2/nomad/structs/config" ) // EnterpriseAgent holds information and methods for enterprise functionality diff --git a/command/agent/agent_endpoint.go b/command/agent/agent_endpoint.go index a3319485268..c77952f9051 100644 --- a/command/agent/agent_endpoint.go +++ b/command/agent/agent_endpoint.go @@ -18,14 +18,14 @@ import ( log "github.com/hashicorp/go-hclog" "github.com/hashicorp/go-msgpack/v2/codec" - "github.com/hashicorp/nomad/acl" "github.com/hashicorp/nomad/api" - cstructs "github.com/hashicorp/nomad/client/structs" - "github.com/hashicorp/nomad/command/agent/host" - "github.com/hashicorp/nomad/command/agent/monitor" - "github.com/hashicorp/nomad/command/agent/pprof" - "github.com/hashicorp/nomad/nomad" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/acl" + cstructs "github.com/hashicorp/nomad/v2/client/structs" + "github.com/hashicorp/nomad/v2/command/agent/host" + "github.com/hashicorp/nomad/v2/command/agent/monitor" + "github.com/hashicorp/nomad/v2/command/agent/pprof" + "github.com/hashicorp/nomad/v2/nomad" + "github.com/hashicorp/nomad/v2/nomad/structs" "github.com/hashicorp/serf/serf" "github.com/moby/moby/v2/pkg/ioutils" ) diff --git a/command/agent/agent_endpoint_test.go b/command/agent/agent_endpoint_test.go index db31637842b..8d5effaf1b1 100644 --- a/command/agent/agent_endpoint_test.go +++ b/command/agent/agent_endpoint_test.go @@ -24,14 +24,14 @@ import ( "time" msgpackrpc "github.com/hashicorp/net-rpc-msgpackrpc/v2" - "github.com/hashicorp/nomad/acl" + "github.com/hashicorp/nomad/v2/acl" "github.com/hashicorp/nomad/api" - "github.com/hashicorp/nomad/ci" - sframer "github.com/hashicorp/nomad/client/lib/streamframer" - "github.com/hashicorp/nomad/helper/pool" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/testutil" + "github.com/hashicorp/nomad/v2/ci" + sframer "github.com/hashicorp/nomad/v2/client/lib/streamframer" + "github.com/hashicorp/nomad/v2/helper/pool" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/testutil" "github.com/shoenig/test/must" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/command/agent/agent_test.go b/command/agent/agent_test.go index 84e025aba4c..07b48a2f856 100644 --- a/command/agent/agent_test.go +++ b/command/agent/agent_test.go @@ -13,14 +13,14 @@ import ( "testing" "time" - "github.com/hashicorp/nomad/ci" - clientconfig "github.com/hashicorp/nomad/client/config" - cstructs "github.com/hashicorp/nomad/client/structs" - "github.com/hashicorp/nomad/helper/testlog" - "github.com/hashicorp/nomad/nomad" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/nomad/structs/config" - "github.com/hashicorp/nomad/testutil" + "github.com/hashicorp/nomad/v2/ci" + clientconfig "github.com/hashicorp/nomad/v2/client/config" + cstructs "github.com/hashicorp/nomad/v2/client/structs" + "github.com/hashicorp/nomad/v2/helper/testlog" + "github.com/hashicorp/nomad/v2/nomad" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/nomad/structs/config" + "github.com/hashicorp/nomad/v2/testutil" "github.com/hashicorp/raft" "github.com/shoenig/test/must" "github.com/stretchr/testify/assert" diff --git a/command/agent/alloc_endpoint.go b/command/agent/alloc_endpoint.go index 1f757fff2f1..5d53f30d271 100644 --- a/command/agent/alloc_endpoint.go +++ b/command/agent/alloc_endpoint.go @@ -18,9 +18,9 @@ import ( "github.com/golang/snappy" "github.com/gorilla/websocket" "github.com/hashicorp/go-msgpack/v2/codec" - cstructs "github.com/hashicorp/nomad/client/structs" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/plugins/drivers" + cstructs "github.com/hashicorp/nomad/v2/client/structs" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/plugins/drivers" ) const ( diff --git a/command/agent/alloc_endpoint_test.go b/command/agent/alloc_endpoint_test.go index fadf285c609..ebf70735f5b 100644 --- a/command/agent/alloc_endpoint_test.go +++ b/command/agent/alloc_endpoint_test.go @@ -21,14 +21,14 @@ import ( "github.com/golang/snappy" "github.com/gorilla/websocket" "github.com/hashicorp/go-msgpack/v2/codec" - "github.com/hashicorp/nomad/acl" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/client/allocdir" - cstructs "github.com/hashicorp/nomad/client/structs" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/testutil" + "github.com/hashicorp/nomad/v2/acl" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/client/allocdir" + cstructs "github.com/hashicorp/nomad/v2/client/structs" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/testutil" "github.com/shoenig/test" "github.com/shoenig/test/must" "github.com/stretchr/testify/require" diff --git a/command/agent/command.go b/command/agent/command.go index 876acc4656e..4dcb86ff0ef 100644 --- a/command/agent/command.go +++ b/command/agent/command.go @@ -29,14 +29,14 @@ import ( "github.com/hashicorp/go-metrics/compat/datadog" "github.com/hashicorp/go-metrics/compat/prometheus" gsyslog "github.com/hashicorp/go-syslog" - "github.com/hashicorp/nomad/helper" - flaghelper "github.com/hashicorp/nomad/helper/flags" - gatedwriter "github.com/hashicorp/nomad/helper/gated-writer" - "github.com/hashicorp/nomad/helper/logging" - "github.com/hashicorp/nomad/helper/winsvc" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/nomad/structs/config" - "github.com/hashicorp/nomad/version" + "github.com/hashicorp/nomad/v2/helper" + flaghelper "github.com/hashicorp/nomad/v2/helper/flags" + gatedwriter "github.com/hashicorp/nomad/v2/helper/gated-writer" + "github.com/hashicorp/nomad/v2/helper/logging" + "github.com/hashicorp/nomad/v2/helper/winsvc" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/nomad/structs/config" + "github.com/hashicorp/nomad/v2/version" "github.com/posener/complete" "golang.org/x/text/cases" "golang.org/x/text/language" diff --git a/command/agent/command_test.go b/command/agent/command_test.go index 9ddd21de545..75de7a85074 100644 --- a/command/agent/command_test.go +++ b/command/agent/command_test.go @@ -13,10 +13,10 @@ import ( "github.com/hashicorp/cli" "github.com/hashicorp/go-hclog" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/nomad/structs/config" - "github.com/hashicorp/nomad/version" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/nomad/structs/config" + "github.com/hashicorp/nomad/v2/version" "github.com/shoenig/test/must" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/command/agent/config.go b/command/agent/config.go index 50bb2ba0006..e5276cd32c7 100644 --- a/command/agent/config.go +++ b/command/agent/config.go @@ -23,17 +23,17 @@ import ( "github.com/hashicorp/go-secure-stdlib/listenerutil" sockaddr "github.com/hashicorp/go-sockaddr" "github.com/hashicorp/go-sockaddr/template" - client "github.com/hashicorp/nomad/client/config" - "github.com/hashicorp/nomad/client/fingerprint" - "github.com/hashicorp/nomad/helper" - "github.com/hashicorp/nomad/helper/ipaddr" - "github.com/hashicorp/nomad/helper/pointer" - "github.com/hashicorp/nomad/helper/users" - "github.com/hashicorp/nomad/helper/winsvc" - "github.com/hashicorp/nomad/nomad" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/nomad/structs/config" - "github.com/hashicorp/nomad/version" + client "github.com/hashicorp/nomad/v2/client/config" + "github.com/hashicorp/nomad/v2/client/fingerprint" + "github.com/hashicorp/nomad/v2/helper" + "github.com/hashicorp/nomad/v2/helper/ipaddr" + "github.com/hashicorp/nomad/v2/helper/pointer" + "github.com/hashicorp/nomad/v2/helper/users" + "github.com/hashicorp/nomad/v2/helper/winsvc" + "github.com/hashicorp/nomad/v2/nomad" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/nomad/structs/config" + "github.com/hashicorp/nomad/v2/version" ) // Config is the configuration for the Nomad agent. diff --git a/command/agent/config_parse.go b/command/agent/config_parse.go index 1f1f3b950ce..fde151c36ab 100644 --- a/command/agent/config_parse.go +++ b/command/agent/config_parse.go @@ -17,11 +17,11 @@ import ( "github.com/go-viper/mapstructure/v2" "github.com/hashicorp/hcl" "github.com/hashicorp/hcl/hcl/ast" - client "github.com/hashicorp/nomad/client/config" - "github.com/hashicorp/nomad/helper" - "github.com/hashicorp/nomad/helper/ipaddr" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/nomad/structs/config" + client "github.com/hashicorp/nomad/v2/client/config" + "github.com/hashicorp/nomad/v2/helper" + "github.com/hashicorp/nomad/v2/helper/ipaddr" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/nomad/structs/config" ) // ParseConfigFile returns an agent.Config from parsed from a file. diff --git a/command/agent/config_parse_test.go b/command/agent/config_parse_test.go index 36a1852ff52..a5dd51a0ea7 100644 --- a/command/agent/config_parse_test.go +++ b/command/agent/config_parse_test.go @@ -10,10 +10,10 @@ import ( "testing" "time" - "github.com/hashicorp/nomad/ci" - client "github.com/hashicorp/nomad/client/config" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/nomad/structs/config" + "github.com/hashicorp/nomad/v2/ci" + client "github.com/hashicorp/nomad/v2/client/config" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/nomad/structs/config" "github.com/shoenig/test/must" ) diff --git a/command/agent/config_test.go b/command/agent/config_test.go index ed65e7418af..8c9ffa58c30 100644 --- a/command/agent/config_test.go +++ b/command/agent/config_test.go @@ -15,11 +15,11 @@ import ( "time" sockaddr "github.com/hashicorp/go-sockaddr" - "github.com/hashicorp/nomad/ci" - client "github.com/hashicorp/nomad/client/config" - "github.com/hashicorp/nomad/client/testutil" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/nomad/structs/config" + "github.com/hashicorp/nomad/v2/ci" + client "github.com/hashicorp/nomad/v2/client/config" + "github.com/hashicorp/nomad/v2/client/testutil" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/nomad/structs/config" "github.com/shoenig/test" "github.com/shoenig/test/must" "github.com/stretchr/testify/require" diff --git a/command/agent/consul/config_entries_testing.go b/command/agent/consul/config_entries_testing.go index 9fb8f770755..08a1dc4650a 100644 --- a/command/agent/consul/config_entries_testing.go +++ b/command/agent/consul/config_entries_testing.go @@ -8,7 +8,7 @@ import ( "github.com/hashicorp/consul/api" "github.com/hashicorp/go-hclog" - "github.com/hashicorp/nomad/lib/lang" + "github.com/hashicorp/nomad/v2/lib/lang" ) var _ ConfigAPI = (*MockConfigsAPI)(nil) diff --git a/command/agent/consul/connect.go b/command/agent/consul/connect.go index 2542e95fe7d..4fbb92c9a34 100644 --- a/command/agent/consul/connect.go +++ b/command/agent/consul/connect.go @@ -13,7 +13,7 @@ import ( "strings" "github.com/hashicorp/consul/api" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/nomad/structs" ) // newConnect creates a new Consul AgentServiceConnect struct based on a Nomad diff --git a/command/agent/consul/connect_proxies_test.go b/command/agent/consul/connect_proxies_test.go index 86cf29fe79d..4d607a72b9b 100644 --- a/command/agent/consul/connect_proxies_test.go +++ b/command/agent/consul/connect_proxies_test.go @@ -6,7 +6,7 @@ package consul import ( "testing" - "github.com/hashicorp/nomad/ci" + "github.com/hashicorp/nomad/v2/ci" "github.com/stretchr/testify/require" ) diff --git a/command/agent/consul/connect_test.go b/command/agent/consul/connect_test.go index a5e3d1e0505..3c19c7db49a 100644 --- a/command/agent/consul/connect_test.go +++ b/command/agent/consul/connect_test.go @@ -8,9 +8,9 @@ import ( "time" "github.com/hashicorp/consul/api" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/nomad/structs" "github.com/shoenig/test/must" "github.com/stretchr/testify/require" ) diff --git a/command/agent/consul/group_test.go b/command/agent/consul/group_test.go index f8953040b44..304d0e2e7d7 100644 --- a/command/agent/consul/group_test.go +++ b/command/agent/consul/group_test.go @@ -10,11 +10,11 @@ import ( consulapi "github.com/hashicorp/consul/api" "github.com/hashicorp/consul/sdk/testutil" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/client/serviceregistration" - "github.com/hashicorp/nomad/helper/testlog" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/client/serviceregistration" + "github.com/hashicorp/nomad/v2/helper/testlog" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" "github.com/stretchr/testify/require" ) diff --git a/command/agent/consul/int_test.go b/command/agent/consul/int_test.go index f3f948172a9..df5f4b596e1 100644 --- a/command/agent/consul/int_test.go +++ b/command/agent/consul/int_test.go @@ -12,22 +12,22 @@ import ( consulapi "github.com/hashicorp/consul/api" "github.com/hashicorp/consul/sdk/testutil" log "github.com/hashicorp/go-hclog" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/client/allocdir" - "github.com/hashicorp/nomad/client/allocrunner/taskrunner" - "github.com/hashicorp/nomad/client/config" - "github.com/hashicorp/nomad/client/devicemanager" - "github.com/hashicorp/nomad/client/lib/proclib" - "github.com/hashicorp/nomad/client/pluginmanager/drivermanager" - regMock "github.com/hashicorp/nomad/client/serviceregistration/mock" - "github.com/hashicorp/nomad/client/serviceregistration/wrapper" - "github.com/hashicorp/nomad/client/state" - cstructs "github.com/hashicorp/nomad/client/structs" - "github.com/hashicorp/nomad/client/vaultclient" - "github.com/hashicorp/nomad/command/agent/consul" - "github.com/hashicorp/nomad/helper/testlog" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/client/allocdir" + "github.com/hashicorp/nomad/v2/client/allocrunner/taskrunner" + "github.com/hashicorp/nomad/v2/client/config" + "github.com/hashicorp/nomad/v2/client/devicemanager" + "github.com/hashicorp/nomad/v2/client/lib/proclib" + "github.com/hashicorp/nomad/v2/client/pluginmanager/drivermanager" + regMock "github.com/hashicorp/nomad/v2/client/serviceregistration/mock" + "github.com/hashicorp/nomad/v2/client/serviceregistration/wrapper" + "github.com/hashicorp/nomad/v2/client/state" + cstructs "github.com/hashicorp/nomad/v2/client/structs" + "github.com/hashicorp/nomad/v2/client/vaultclient" + "github.com/hashicorp/nomad/v2/command/agent/consul" + "github.com/hashicorp/nomad/v2/helper/testlog" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" "github.com/shoenig/test/must" "github.com/stretchr/testify/require" ) diff --git a/command/agent/consul/namespaces_client_test.go b/command/agent/consul/namespaces_client_test.go index cef83a0a30a..707aa461493 100644 --- a/command/agent/consul/namespaces_client_test.go +++ b/command/agent/consul/namespaces_client_test.go @@ -8,7 +8,7 @@ import ( "testing" "time" - "github.com/hashicorp/nomad/ci" + "github.com/hashicorp/nomad/v2/ci" "github.com/stretchr/testify/require" ) diff --git a/command/agent/consul/self_test.go b/command/agent/consul/self_test.go index 6cf21c16f09..08a7aff7d15 100644 --- a/command/agent/consul/self_test.go +++ b/command/agent/consul/self_test.go @@ -6,7 +6,7 @@ package consul import ( "testing" - "github.com/hashicorp/nomad/ci" + "github.com/hashicorp/nomad/v2/ci" "github.com/stretchr/testify/require" ) diff --git a/command/agent/consul/service_client.go b/command/agent/consul/service_client.go index ac6f330fe0f..c22acf90bb8 100644 --- a/command/agent/consul/service_client.go +++ b/command/agent/consul/service_client.go @@ -24,10 +24,10 @@ import ( metrics "github.com/hashicorp/go-metrics/compat" "github.com/hashicorp/go-multierror" "github.com/hashicorp/go-set/v3" - "github.com/hashicorp/nomad/client/serviceregistration" - "github.com/hashicorp/nomad/helper" - "github.com/hashicorp/nomad/helper/envoy" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/client/serviceregistration" + "github.com/hashicorp/nomad/v2/helper" + "github.com/hashicorp/nomad/v2/helper/envoy" + "github.com/hashicorp/nomad/v2/nomad/structs" ) const ( diff --git a/command/agent/consul/service_client_test.go b/command/agent/consul/service_client_test.go index 5093f7abaf4..45267f66312 100644 --- a/command/agent/consul/service_client_test.go +++ b/command/agent/consul/service_client_test.go @@ -10,11 +10,11 @@ import ( "time" "github.com/hashicorp/consul/api" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/client/serviceregistration" - "github.com/hashicorp/nomad/helper/testlog" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/client/serviceregistration" + "github.com/hashicorp/nomad/v2/helper/testlog" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/nomad/structs" "github.com/shoenig/test/must" "github.com/stretchr/testify/require" ) diff --git a/command/agent/consul/structs.go b/command/agent/consul/structs.go index 2320764527d..e191802f533 100644 --- a/command/agent/consul/structs.go +++ b/command/agent/consul/structs.go @@ -4,11 +4,11 @@ package consul import ( - "github.com/hashicorp/nomad/client/serviceregistration" - "github.com/hashicorp/nomad/client/taskenv" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/plugins/drivers" + "github.com/hashicorp/nomad/v2/client/serviceregistration" + "github.com/hashicorp/nomad/v2/client/taskenv" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/plugins/drivers" ) func BuildAllocServices( diff --git a/command/agent/consul/testing.go b/command/agent/consul/testing.go index 72f87447fb7..d08e33bef1f 100644 --- a/command/agent/consul/testing.go +++ b/command/agent/consul/testing.go @@ -6,8 +6,8 @@ package consul import ( "context" - "github.com/hashicorp/nomad/client/serviceregistration" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/client/serviceregistration" + "github.com/hashicorp/nomad/v2/nomad/structs" ) func NoopRestarter() serviceregistration.WorkloadRestarter { diff --git a/command/agent/consul/unit_test.go b/command/agent/consul/unit_test.go index 68e47f5d3d6..a7545dca760 100644 --- a/command/agent/consul/unit_test.go +++ b/command/agent/consul/unit_test.go @@ -13,12 +13,12 @@ import ( "time" "github.com/hashicorp/consul/api" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/client/serviceregistration" - "github.com/hashicorp/nomad/helper/testlog" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/plugins/drivers" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/client/serviceregistration" + "github.com/hashicorp/nomad/v2/helper/testlog" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/plugins/drivers" "github.com/kr/pretty" "github.com/shoenig/test/must" "github.com/stretchr/testify/require" diff --git a/command/agent/consul/version_checker.go b/command/agent/consul/version_checker.go index 19d7bd2af91..96d22a3100b 100644 --- a/command/agent/consul/version_checker.go +++ b/command/agent/consul/version_checker.go @@ -10,7 +10,7 @@ import ( log "github.com/hashicorp/go-hclog" version "github.com/hashicorp/go-version" - "github.com/hashicorp/nomad/helper" + "github.com/hashicorp/nomad/v2/helper" ) // checkConsulTLSSkipVerify logs if Consul does not support TLSSkipVerify on diff --git a/command/agent/consul/version_checker_test.go b/command/agent/consul/version_checker_test.go index c76d7501c42..d5e26b971f5 100644 --- a/command/agent/consul/version_checker_test.go +++ b/command/agent/consul/version_checker_test.go @@ -7,7 +7,7 @@ import ( "encoding/json" "testing" - "github.com/hashicorp/nomad/ci" + "github.com/hashicorp/nomad/v2/ci" ) func TestConsulSupportsTLSSkipVerify(t *testing.T) { diff --git a/command/agent/csi_endpoint.go b/command/agent/csi_endpoint.go index 69d13c67040..4bda1902402 100644 --- a/command/agent/csi_endpoint.go +++ b/command/agent/csi_endpoint.go @@ -8,7 +8,7 @@ import ( "strconv" "strings" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/nomad/structs" ) func (s *HTTPServer) CSIVolumesRequest(resp http.ResponseWriter, req *http.Request) (interface{}, error) { diff --git a/command/agent/csi_endpoint_test.go b/command/agent/csi_endpoint_test.go index bd78b00c94b..bfbcf407e78 100644 --- a/command/agent/csi_endpoint_test.go +++ b/command/agent/csi_endpoint_test.go @@ -10,9 +10,9 @@ import ( "testing" "github.com/hashicorp/nomad/api" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/nomad/state" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/nomad/state" + "github.com/hashicorp/nomad/v2/nomad/structs" "github.com/stretchr/testify/require" ) diff --git a/command/agent/deployment_endpoint.go b/command/agent/deployment_endpoint.go index 986ff949ce2..3210ab34bf2 100644 --- a/command/agent/deployment_endpoint.go +++ b/command/agent/deployment_endpoint.go @@ -7,7 +7,7 @@ import ( "net/http" "strings" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/nomad/structs" ) func (s *HTTPServer) DeploymentsRequest(resp http.ResponseWriter, req *http.Request) (interface{}, error) { diff --git a/command/agent/deployment_endpoint_test.go b/command/agent/deployment_endpoint_test.go index b95b4f7b5b6..91daabfeeb6 100644 --- a/command/agent/deployment_endpoint_test.go +++ b/command/agent/deployment_endpoint_test.go @@ -8,9 +8,9 @@ import ( "net/http/httptest" "testing" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" "github.com/stretchr/testify/assert" ) diff --git a/command/agent/eval_endpoint.go b/command/agent/eval_endpoint.go index 9c972f5056b..8d4a3946d53 100644 --- a/command/agent/eval_endpoint.go +++ b/command/agent/eval_endpoint.go @@ -8,7 +8,7 @@ import ( "net/http" "strings" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/nomad/structs" ) // EvalsRequest is the entry point for /v1/evaluations and is responsible for diff --git a/command/agent/eval_endpoint_test.go b/command/agent/eval_endpoint_test.go index 104c33f44af..5d8b4ec25eb 100644 --- a/command/agent/eval_endpoint_test.go +++ b/command/agent/eval_endpoint_test.go @@ -11,10 +11,10 @@ import ( "testing" "github.com/hashicorp/nomad/api" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" "github.com/shoenig/test/must" "github.com/stretchr/testify/require" ) diff --git a/command/agent/event_endpoint.go b/command/agent/event_endpoint.go index eb0a50846e0..81c1cf0a082 100644 --- a/command/agent/event_endpoint.go +++ b/command/agent/event_endpoint.go @@ -16,7 +16,7 @@ import ( "time" "github.com/hashicorp/go-msgpack/v2/codec" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/nomad/structs" "github.com/moby/moby/v2/pkg/ioutils" "golang.org/x/sync/errgroup" ) diff --git a/command/agent/event_endpoint_test.go b/command/agent/event_endpoint_test.go index 4d553d7f7fc..1713042d3f1 100644 --- a/command/agent/event_endpoint_test.go +++ b/command/agent/event_endpoint_test.go @@ -15,11 +15,11 @@ import ( "time" "github.com/hashicorp/nomad/api" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/testutil" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/testutil" "github.com/shoenig/test/must" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/command/agent/fs_endpoint.go b/command/agent/fs_endpoint.go index 348ef8a1a25..4dba5652e7c 100644 --- a/command/agent/fs_endpoint.go +++ b/command/agent/fs_endpoint.go @@ -14,8 +14,8 @@ import ( "strings" "github.com/hashicorp/go-msgpack/v2/codec" - cstructs "github.com/hashicorp/nomad/client/structs" - "github.com/hashicorp/nomad/nomad/structs" + cstructs "github.com/hashicorp/nomad/v2/client/structs" + "github.com/hashicorp/nomad/v2/nomad/structs" "github.com/moby/moby/v2/pkg/ioutils" ) diff --git a/command/agent/fs_endpoint_test.go b/command/agent/fs_endpoint_test.go index fa4bc2d8be8..29c331c238f 100644 --- a/command/agent/fs_endpoint_test.go +++ b/command/agent/fs_endpoint_test.go @@ -13,12 +13,12 @@ import ( "testing" "time" - "github.com/hashicorp/nomad/ci" - cstructs "github.com/hashicorp/nomad/client/structs" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/testutil" + "github.com/hashicorp/nomad/v2/ci" + cstructs "github.com/hashicorp/nomad/v2/client/structs" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/testutil" "github.com/stretchr/testify/require" ) diff --git a/command/agent/helpers_test.go b/command/agent/helpers_test.go index fbea8bb82df..657024730d1 100644 --- a/command/agent/helpers_test.go +++ b/command/agent/helpers_test.go @@ -6,8 +6,8 @@ package agent import ( "testing" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/helper/uuid" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/helper/uuid" "github.com/shoenig/test/must" ) diff --git a/command/agent/host_volume_endpoint.go b/command/agent/host_volume_endpoint.go index 81ae416863a..b3d53875bc3 100644 --- a/command/agent/host_volume_endpoint.go +++ b/command/agent/host_volume_endpoint.go @@ -8,7 +8,7 @@ import ( "strconv" "strings" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/nomad/structs" ) func (s *HTTPServer) HostVolumesListRequest(resp http.ResponseWriter, req *http.Request) (any, error) { diff --git a/command/agent/host_volume_endpoint_test.go b/command/agent/host_volume_endpoint_test.go index c6435b2eb45..8a50c4e6812 100644 --- a/command/agent/host_volume_endpoint_test.go +++ b/command/agent/host_volume_endpoint_test.go @@ -10,8 +10,8 @@ import ( "net/url" "testing" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" "github.com/shoenig/test/must" ) diff --git a/command/agent/http.go b/command/agent/http.go index 48238f4c07c..ae9adc7eb20 100644 --- a/command/agent/http.go +++ b/command/agent/http.go @@ -31,14 +31,14 @@ import ( "github.com/rs/cors" "golang.org/x/time/rate" - "github.com/hashicorp/nomad/acl" - "github.com/hashicorp/nomad/client" - "github.com/hashicorp/nomad/command/agent/event" - "github.com/hashicorp/nomad/helper/noxssrw" - "github.com/hashicorp/nomad/helper/tlsutil" - "github.com/hashicorp/nomad/nomad" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/nomad/structs/config" + "github.com/hashicorp/nomad/v2/acl" + "github.com/hashicorp/nomad/v2/client" + "github.com/hashicorp/nomad/v2/command/agent/event" + "github.com/hashicorp/nomad/v2/helper/noxssrw" + "github.com/hashicorp/nomad/v2/helper/tlsutil" + "github.com/hashicorp/nomad/v2/nomad" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/nomad/structs/config" ) const ( diff --git a/command/agent/http_stdlog_test.go b/command/agent/http_stdlog_test.go index cd1ac7647bf..499daf65147 100644 --- a/command/agent/http_stdlog_test.go +++ b/command/agent/http_stdlog_test.go @@ -8,7 +8,7 @@ import ( "testing" "github.com/hashicorp/go-hclog" - "github.com/hashicorp/nomad/ci" + "github.com/hashicorp/nomad/v2/ci" "github.com/stretchr/testify/require" ) diff --git a/command/agent/http_test.go b/command/agent/http_test.go index f5b460c0e75..0d2c0d8b647 100644 --- a/command/agent/http_test.go +++ b/command/agent/http_test.go @@ -23,15 +23,15 @@ import ( "time" "github.com/hashicorp/go-msgpack/v2/codec" - "github.com/hashicorp/nomad/acl" + "github.com/hashicorp/nomad/v2/acl" "github.com/hashicorp/nomad/api" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/helper/testlog" - "github.com/hashicorp/nomad/nomad" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/nomad/structs/config" - "github.com/hashicorp/nomad/testutil" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/helper/testlog" + "github.com/hashicorp/nomad/v2/nomad" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/nomad/structs/config" + "github.com/hashicorp/nomad/v2/testutil" "github.com/shoenig/test/must" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/command/agent/job_endpoint.go b/command/agent/job_endpoint.go index 6774c11bbdc..f453680e0da 100644 --- a/command/agent/job_endpoint.go +++ b/command/agent/job_endpoint.go @@ -14,11 +14,11 @@ import ( "strings" "github.com/golang/snappy" - "github.com/hashicorp/nomad/acl" api "github.com/hashicorp/nomad/api" - cstructs "github.com/hashicorp/nomad/client/structs" - "github.com/hashicorp/nomad/jobspec2" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/acl" + cstructs "github.com/hashicorp/nomad/v2/client/structs" + "github.com/hashicorp/nomad/v2/jobspec2" + "github.com/hashicorp/nomad/v2/nomad/structs" ) // jobNotFoundErr is an error string which can be used as the return string diff --git a/command/agent/job_endpoint_statuses.go b/command/agent/job_endpoint_statuses.go index fe1ef713978..5c327c032fd 100644 --- a/command/agent/job_endpoint_statuses.go +++ b/command/agent/job_endpoint_statuses.go @@ -8,7 +8,7 @@ import ( "net/http" "github.com/hashicorp/nomad/api" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/nomad/structs" ) // JobStatusesRequest looks up the status of jobs' allocs and deployments, diff --git a/command/agent/job_endpoint_statuses_test.go b/command/agent/job_endpoint_statuses_test.go index df5938a696b..8bb453798f8 100644 --- a/command/agent/job_endpoint_statuses_test.go +++ b/command/agent/job_endpoint_statuses_test.go @@ -13,9 +13,9 @@ import ( "testing" "time" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" "github.com/shoenig/test" "github.com/shoenig/test/must" ) diff --git a/command/agent/job_endpoint_test.go b/command/agent/job_endpoint_test.go index 9ad273d7b86..67efeac3859 100644 --- a/command/agent/job_endpoint_test.go +++ b/command/agent/job_endpoint_test.go @@ -14,11 +14,11 @@ import ( "time" "github.com/golang/snappy" - "github.com/hashicorp/nomad/acl" + "github.com/hashicorp/nomad/v2/acl" api "github.com/hashicorp/nomad/api" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" "github.com/shoenig/test/must" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/command/agent/keyring_endpoint.go b/command/agent/keyring_endpoint.go index 657a96e35f0..3f38859a6fb 100644 --- a/command/agent/keyring_endpoint.go +++ b/command/agent/keyring_endpoint.go @@ -11,8 +11,8 @@ import ( "time" "github.com/go-jose/go-jose/v3" - "github.com/hashicorp/nomad/helper" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/helper" + "github.com/hashicorp/nomad/v2/nomad/structs" ) // jwksMinMaxAge is the minimum amount of time the JWKS endpoint will instruct diff --git a/command/agent/keyring_endpoint_test.go b/command/agent/keyring_endpoint_test.go index 49687659f24..e741ad9b32b 100644 --- a/command/agent/keyring_endpoint_test.go +++ b/command/agent/keyring_endpoint_test.go @@ -13,11 +13,11 @@ import ( "time" "github.com/go-jose/go-jose/v3" - "github.com/hashicorp/nomad/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/mock" "github.com/shoenig/test/must" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/nomad/structs" ) func TestHTTP_Keyring_CRUD(t *testing.T) { diff --git a/command/agent/keyring_test.go b/command/agent/keyring_test.go index 4e7c47f7807..987b44b8478 100644 --- a/command/agent/keyring_test.go +++ b/command/agent/keyring_test.go @@ -10,8 +10,8 @@ import ( "testing" "github.com/hashicorp/go-hclog" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/helper/testlog" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/helper/testlog" ) func TestAgent_LoadKeyrings(t *testing.T) { diff --git a/command/agent/log_file_test.go b/command/agent/log_file_test.go index a73dd3373e9..bcb2a5ba0b0 100644 --- a/command/agent/log_file_test.go +++ b/command/agent/log_file_test.go @@ -9,7 +9,7 @@ import ( "testing" "time" - "github.com/hashicorp/nomad/ci" + "github.com/hashicorp/nomad/v2/ci" "github.com/shoenig/test/must" ) diff --git a/command/agent/log_levels_test.go b/command/agent/log_levels_test.go index cc6fddf3ab7..8dc047dea4d 100644 --- a/command/agent/log_levels_test.go +++ b/command/agent/log_levels_test.go @@ -6,7 +6,7 @@ package agent import ( "testing" - "github.com/hashicorp/nomad/ci" + "github.com/hashicorp/nomad/v2/ci" "github.com/shoenig/test/must" ) diff --git a/command/agent/meta_endpoint.go b/command/agent/meta_endpoint.go index 78167465f9a..082b1c4eb6f 100644 --- a/command/agent/meta_endpoint.go +++ b/command/agent/meta_endpoint.go @@ -6,7 +6,7 @@ package agent import ( "net/http" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/nomad/structs" ) func (s *HTTPServer) NodeMetaRequest(resp http.ResponseWriter, req *http.Request) (interface{}, error) { diff --git a/command/agent/metrics_endpoint_test.go b/command/agent/metrics_endpoint_test.go index d589c8719c1..de27a7c03fa 100644 --- a/command/agent/metrics_endpoint_test.go +++ b/command/agent/metrics_endpoint_test.go @@ -11,10 +11,10 @@ import ( "time" metrics "github.com/hashicorp/go-metrics/compat" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/testutil" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/testutil" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/command/agent/monitor/monitor.go b/command/agent/monitor/monitor.go index f40f8181a1a..e3a5bf2227d 100644 --- a/command/agent/monitor/monitor.go +++ b/command/agent/monitor/monitor.go @@ -9,7 +9,7 @@ import ( "time" log "github.com/hashicorp/go-hclog" - "github.com/hashicorp/nomad/helper" + "github.com/hashicorp/nomad/v2/helper" ) // Monitor provides a mechanism to stream logs using go-hclog diff --git a/command/agent/monitor/monitor_test.go b/command/agent/monitor/monitor_test.go index 483ce2cf26e..0ee102c9e83 100644 --- a/command/agent/monitor/monitor_test.go +++ b/command/agent/monitor/monitor_test.go @@ -13,7 +13,7 @@ import ( "time" log "github.com/hashicorp/go-hclog" - "github.com/hashicorp/nomad/ci" + "github.com/hashicorp/nomad/v2/ci" "github.com/shoenig/test/must" "github.com/stretchr/testify/require" ) diff --git a/command/agent/monitor/stream_helpers.go b/command/agent/monitor/stream_helpers.go index c1db61d7477..94b820636d1 100644 --- a/command/agent/monitor/stream_helpers.go +++ b/command/agent/monitor/stream_helpers.go @@ -12,8 +12,8 @@ import ( "syscall" "github.com/hashicorp/go-msgpack/v2/codec" - sframer "github.com/hashicorp/nomad/client/lib/streamframer" - cstructs "github.com/hashicorp/nomad/client/structs" + sframer "github.com/hashicorp/nomad/v2/client/lib/streamframer" + cstructs "github.com/hashicorp/nomad/v2/client/structs" ) // StreamReader is used to process fixed length streams for consumers diff --git a/command/agent/monitor/stream_helpers_test.go b/command/agent/monitor/stream_helpers_test.go index 86e9d2c9e2c..cadc072998b 100644 --- a/command/agent/monitor/stream_helpers_test.go +++ b/command/agent/monitor/stream_helpers_test.go @@ -12,8 +12,8 @@ import ( "testing" "time" - "github.com/hashicorp/nomad/ci" - sframer "github.com/hashicorp/nomad/client/lib/streamframer" + "github.com/hashicorp/nomad/v2/ci" + sframer "github.com/hashicorp/nomad/v2/client/lib/streamframer" "github.com/shoenig/test/must" ) diff --git a/command/agent/monitor/test_helpers.go b/command/agent/monitor/test_helpers.go index 25ee9288eb4..3feb63518a2 100644 --- a/command/agent/monitor/test_helpers.go +++ b/command/agent/monitor/test_helpers.go @@ -15,9 +15,9 @@ import ( "time" "github.com/hashicorp/go-msgpack/v2/codec" - sframer "github.com/hashicorp/nomad/client/lib/streamframer" - cstructs "github.com/hashicorp/nomad/client/structs" - "github.com/hashicorp/nomad/nomad/structs" + sframer "github.com/hashicorp/nomad/v2/client/lib/streamframer" + cstructs "github.com/hashicorp/nomad/v2/client/structs" + "github.com/hashicorp/nomad/v2/nomad/structs" "github.com/shoenig/test/must" ) diff --git a/command/agent/namespace_endpoint.go b/command/agent/namespace_endpoint.go index a8cfb1a3e49..62054a95eb5 100644 --- a/command/agent/namespace_endpoint.go +++ b/command/agent/namespace_endpoint.go @@ -7,7 +7,7 @@ import ( "net/http" "strings" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/nomad/structs" ) func (s *HTTPServer) NamespacesRequest(resp http.ResponseWriter, req *http.Request) (interface{}, error) { diff --git a/command/agent/namespace_endpoint_test.go b/command/agent/namespace_endpoint_test.go index 8d536e57857..f54a5205768 100644 --- a/command/agent/namespace_endpoint_test.go +++ b/command/agent/namespace_endpoint_test.go @@ -8,9 +8,9 @@ import ( "net/http/httptest" "testing" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" "github.com/stretchr/testify/assert" ) diff --git a/command/agent/node_endpoint.go b/command/agent/node_endpoint.go index 70e3ca8ce81..98aa3a1c38f 100644 --- a/command/agent/node_endpoint.go +++ b/command/agent/node_endpoint.go @@ -9,7 +9,7 @@ import ( "strings" "github.com/hashicorp/nomad/api" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/nomad/structs" ) func (s *HTTPServer) NodesRequest(resp http.ResponseWriter, req *http.Request) (interface{}, error) { diff --git a/command/agent/node_endpoint_test.go b/command/agent/node_endpoint_test.go index 0eced7e0122..999c8854e5e 100644 --- a/command/agent/node_endpoint_test.go +++ b/command/agent/node_endpoint_test.go @@ -10,9 +10,9 @@ import ( "time" "github.com/hashicorp/nomad/api" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" "github.com/shoenig/test/must" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/command/agent/node_identity_endpoint.go b/command/agent/node_identity_endpoint.go index f42e9da0ce3..7c7015e53db 100644 --- a/command/agent/node_identity_endpoint.go +++ b/command/agent/node_identity_endpoint.go @@ -6,7 +6,7 @@ package agent import ( "net/http" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/nomad/structs" ) func (s *HTTPServer) NodeIdentityGetRequest(resp http.ResponseWriter, req *http.Request) (any, error) { diff --git a/command/agent/node_identity_endpoint_test.go b/command/agent/node_identity_endpoint_test.go index a38bbb04812..ffb19fd9a6d 100644 --- a/command/agent/node_identity_endpoint_test.go +++ b/command/agent/node_identity_endpoint_test.go @@ -8,10 +8,10 @@ import ( "net/http/httptest" "testing" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/testutil" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/testutil" "github.com/shoenig/test/must" ) diff --git a/command/agent/node_pool_endpoint.go b/command/agent/node_pool_endpoint.go index 0e0fe8d0d5e..7074db6d831 100644 --- a/command/agent/node_pool_endpoint.go +++ b/command/agent/node_pool_endpoint.go @@ -8,7 +8,7 @@ import ( "net/http" "strings" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/nomad/structs" ) func (s *HTTPServer) NodePoolsRequest(resp http.ResponseWriter, req *http.Request) (any, error) { diff --git a/command/agent/node_pool_endpoint_test.go b/command/agent/node_pool_endpoint_test.go index c500512c0ee..cce60ce9f01 100644 --- a/command/agent/node_pool_endpoint_test.go +++ b/command/agent/node_pool_endpoint_test.go @@ -11,9 +11,9 @@ import ( "testing" "github.com/google/go-cmp/cmp/cmpopts" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" "github.com/shoenig/test/must" ) diff --git a/command/agent/operator_endpoint.go b/command/agent/operator_endpoint.go index 2139e49f145..3c4a1f71438 100644 --- a/command/agent/operator_endpoint.go +++ b/command/agent/operator_endpoint.go @@ -17,8 +17,8 @@ import ( "github.com/hashicorp/raft" "github.com/hashicorp/nomad/api" - cstructs "github.com/hashicorp/nomad/client/structs" - "github.com/hashicorp/nomad/nomad/structs" + cstructs "github.com/hashicorp/nomad/v2/client/structs" + "github.com/hashicorp/nomad/v2/nomad/structs" ) // OperatorRequest is used route operator/raft API requests to the implementing diff --git a/command/agent/operator_endpoint_ce.go b/command/agent/operator_endpoint_ce.go index 2ccb355d8be..c6407dfd449 100644 --- a/command/agent/operator_endpoint_ce.go +++ b/command/agent/operator_endpoint_ce.go @@ -10,7 +10,7 @@ import ( "net/http" "github.com/hashicorp/nomad/api" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/nomad/structs" ) func (s *HTTPServer) LicenseRequest(resp http.ResponseWriter, req *http.Request) (interface{}, error) { diff --git a/command/agent/operator_endpoint_test.go b/command/agent/operator_endpoint_test.go index 3e71519d24e..26f89902fe9 100644 --- a/command/agent/operator_endpoint_test.go +++ b/command/agent/operator_endpoint_test.go @@ -18,10 +18,10 @@ import ( "time" "github.com/hashicorp/nomad/api" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" "github.com/shoenig/test/must" "github.com/shoenig/test/wait" "github.com/stretchr/testify/require" diff --git a/command/agent/plugins.go b/command/agent/plugins.go index 4c5c9398086..9a13e6ee6cb 100644 --- a/command/agent/plugins.go +++ b/command/agent/plugins.go @@ -6,9 +6,9 @@ package agent import ( "fmt" - "github.com/hashicorp/nomad/helper/pluginutils/catalog" - "github.com/hashicorp/nomad/helper/pluginutils/loader" - "github.com/hashicorp/nomad/helper/pluginutils/singleton" + "github.com/hashicorp/nomad/v2/helper/pluginutils/catalog" + "github.com/hashicorp/nomad/v2/helper/pluginutils/loader" + "github.com/hashicorp/nomad/v2/helper/pluginutils/singleton" ) // setupPlugins is used to setup the plugin loaders. diff --git a/command/agent/pprof/pprof_test.go b/command/agent/pprof/pprof_test.go index 9c48824f103..828799ab803 100644 --- a/command/agent/pprof/pprof_test.go +++ b/command/agent/pprof/pprof_test.go @@ -7,7 +7,7 @@ import ( "context" "testing" - "github.com/hashicorp/nomad/ci" + "github.com/hashicorp/nomad/v2/ci" "github.com/stretchr/testify/require" ) diff --git a/command/agent/region_endpoint.go b/command/agent/region_endpoint.go index e19b65586de..5d8990d79b3 100644 --- a/command/agent/region_endpoint.go +++ b/command/agent/region_endpoint.go @@ -6,7 +6,7 @@ package agent import ( "net/http" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/nomad/structs" ) func (s *HTTPServer) RegionListRequest(resp http.ResponseWriter, req *http.Request) (interface{}, error) { diff --git a/command/agent/region_endpoint_test.go b/command/agent/region_endpoint_test.go index fbc3ed2cde8..f59b52a94fa 100644 --- a/command/agent/region_endpoint_test.go +++ b/command/agent/region_endpoint_test.go @@ -8,7 +8,7 @@ import ( "net/http/httptest" "testing" - "github.com/hashicorp/nomad/ci" + "github.com/hashicorp/nomad/v2/ci" ) func TestHTTP_RegionList(t *testing.T) { diff --git a/command/agent/retry_join_test.go b/command/agent/retry_join_test.go index 9ae0328d32d..8fe115dbfce 100644 --- a/command/agent/retry_join_test.go +++ b/command/agent/retry_join_test.go @@ -16,10 +16,10 @@ import ( "github.com/hashicorp/cli" "github.com/hashicorp/go-hclog" "github.com/hashicorp/go-netaddrs" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/helper" - "github.com/hashicorp/nomad/helper/testlog" - "github.com/hashicorp/nomad/testutil" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/helper" + "github.com/hashicorp/nomad/v2/helper/testlog" + "github.com/hashicorp/nomad/v2/testutil" "github.com/shoenig/test/must" ) diff --git a/command/agent/scaling_endpoint.go b/command/agent/scaling_endpoint.go index 4a453f0662c..d8b144452c2 100644 --- a/command/agent/scaling_endpoint.go +++ b/command/agent/scaling_endpoint.go @@ -8,7 +8,7 @@ import ( "strings" "github.com/hashicorp/nomad/api" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/nomad/structs" ) func (s *HTTPServer) ScalingPoliciesRequest(resp http.ResponseWriter, req *http.Request) (interface{}, error) { diff --git a/command/agent/scaling_endpoint_test.go b/command/agent/scaling_endpoint_test.go index 5bfe38609b7..9642444b45e 100644 --- a/command/agent/scaling_endpoint_test.go +++ b/command/agent/scaling_endpoint_test.go @@ -8,9 +8,9 @@ import ( "net/http/httptest" "testing" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" "github.com/stretchr/testify/require" ) diff --git a/command/agent/search_endpoint.go b/command/agent/search_endpoint.go index e980d79e58f..7b350b5de0b 100644 --- a/command/agent/search_endpoint.go +++ b/command/agent/search_endpoint.go @@ -6,7 +6,7 @@ package agent import ( "net/http" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/nomad/structs" ) // SearchRequest accepts a prefix and context and returns a list of matching diff --git a/command/agent/search_endpoint_test.go b/command/agent/search_endpoint_test.go index 980344e0287..120a0d8db11 100644 --- a/command/agent/search_endpoint_test.go +++ b/command/agent/search_endpoint_test.go @@ -9,10 +9,10 @@ import ( "net/http/httptest" "testing" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" "github.com/shoenig/test/must" "github.com/stretchr/testify/require" ) diff --git a/command/agent/service_registration_endpoint.go b/command/agent/service_registration_endpoint.go index e03bde91c90..1d4d7d89819 100644 --- a/command/agent/service_registration_endpoint.go +++ b/command/agent/service_registration_endpoint.go @@ -7,7 +7,7 @@ import ( "net/http" "strings" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/nomad/structs" ) // ServiceRegistrationListRequest performs a listing of service registrations diff --git a/command/agent/service_registration_endpoint_test.go b/command/agent/service_registration_endpoint_test.go index a48907b4d87..c1d27db424b 100644 --- a/command/agent/service_registration_endpoint_test.go +++ b/command/agent/service_registration_endpoint_test.go @@ -10,9 +10,9 @@ import ( "testing" "github.com/hashicorp/go-memdb" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" "github.com/shoenig/test/must" "github.com/stretchr/testify/require" ) diff --git a/command/agent/stats_endpoint.go b/command/agent/stats_endpoint.go index 784860c81d1..7d23321d387 100644 --- a/command/agent/stats_endpoint.go +++ b/command/agent/stats_endpoint.go @@ -7,8 +7,8 @@ import ( "net/http" "strings" - cstructs "github.com/hashicorp/nomad/client/structs" - "github.com/hashicorp/nomad/nomad/structs" + cstructs "github.com/hashicorp/nomad/v2/client/structs" + "github.com/hashicorp/nomad/v2/nomad/structs" ) func (s *HTTPServer) ClientStatsRequest(resp http.ResponseWriter, req *http.Request) (interface{}, error) { diff --git a/command/agent/stats_endpoint_test.go b/command/agent/stats_endpoint_test.go index f806f66e9f8..c2b3060fd52 100644 --- a/command/agent/stats_endpoint_test.go +++ b/command/agent/stats_endpoint_test.go @@ -9,12 +9,12 @@ import ( "net/http/httptest" "testing" - "github.com/hashicorp/nomad/acl" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/testutil" + "github.com/hashicorp/nomad/v2/acl" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/testutil" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/command/agent/status_endpoint.go b/command/agent/status_endpoint.go index c96dc897ff2..d46ecca44bd 100644 --- a/command/agent/status_endpoint.go +++ b/command/agent/status_endpoint.go @@ -6,7 +6,7 @@ package agent import ( "net/http" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/nomad/structs" ) func (s *HTTPServer) StatusLeaderRequest(resp http.ResponseWriter, req *http.Request) (interface{}, error) { diff --git a/command/agent/status_endpoint_test.go b/command/agent/status_endpoint_test.go index 9c511fabc5d..9aba9818bd6 100644 --- a/command/agent/status_endpoint_test.go +++ b/command/agent/status_endpoint_test.go @@ -8,7 +8,7 @@ import ( "net/http/httptest" "testing" - "github.com/hashicorp/nomad/ci" + "github.com/hashicorp/nomad/v2/ci" ) func TestHTTP_StatusLeader(t *testing.T) { diff --git a/command/agent/syslog_test.go b/command/agent/syslog_test.go index 042be9caeb2..dbe501cab6c 100644 --- a/command/agent/syslog_test.go +++ b/command/agent/syslog_test.go @@ -8,7 +8,7 @@ import ( "testing" gsyslog "github.com/hashicorp/go-syslog" - "github.com/hashicorp/nomad/ci" + "github.com/hashicorp/nomad/v2/ci" "github.com/shoenig/test/must" ) diff --git a/command/agent/system_endpoint.go b/command/agent/system_endpoint.go index d94025e9f8e..8f48e4d4b5f 100644 --- a/command/agent/system_endpoint.go +++ b/command/agent/system_endpoint.go @@ -6,7 +6,7 @@ package agent import ( "net/http" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/nomad/structs" ) func (s *HTTPServer) GarbageCollectRequest(resp http.ResponseWriter, req *http.Request) (interface{}, error) { diff --git a/command/agent/system_endpoint_test.go b/command/agent/system_endpoint_test.go index 948f33d13ce..4a600764b41 100644 --- a/command/agent/system_endpoint_test.go +++ b/command/agent/system_endpoint_test.go @@ -8,7 +8,7 @@ import ( "net/http/httptest" "testing" - "github.com/hashicorp/nomad/ci" + "github.com/hashicorp/nomad/v2/ci" ) func TestHTTP_SystemGarbageCollect(t *testing.T) { diff --git a/command/agent/task_group_host_volume_claim_endpoint.go b/command/agent/task_group_host_volume_claim_endpoint.go index 2b341b2213b..f92c056a724 100644 --- a/command/agent/task_group_host_volume_claim_endpoint.go +++ b/command/agent/task_group_host_volume_claim_endpoint.go @@ -7,7 +7,7 @@ import ( "net/http" "strings" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/nomad/structs" ) func (s *HTTPServer) TaskGroupHostVolumeClaimRequest(resp http.ResponseWriter, req *http.Request) (any, error) { diff --git a/command/agent/task_group_host_volume_claim_endpoint_test.go b/command/agent/task_group_host_volume_claim_endpoint_test.go index d85c6091d2f..e50d6f00b9c 100644 --- a/command/agent/task_group_host_volume_claim_endpoint_test.go +++ b/command/agent/task_group_host_volume_claim_endpoint_test.go @@ -9,9 +9,9 @@ import ( "net/http/httptest" "testing" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" "github.com/shoenig/test/must" ) diff --git a/command/agent/testagent.go b/command/agent/testagent.go index 965fee28d09..858b1db7d14 100644 --- a/command/agent/testagent.go +++ b/command/agent/testagent.go @@ -17,16 +17,16 @@ import ( "github.com/hashicorp/go-hclog" metrics "github.com/hashicorp/go-metrics/compat" "github.com/hashicorp/nomad/api" - "github.com/hashicorp/nomad/ci" - client "github.com/hashicorp/nomad/client/config" - "github.com/hashicorp/nomad/client/fingerprint" - "github.com/hashicorp/nomad/helper" - "github.com/hashicorp/nomad/helper/testlog" - "github.com/hashicorp/nomad/nomad" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" - sconfig "github.com/hashicorp/nomad/nomad/structs/config" - "github.com/hashicorp/nomad/testutil" + "github.com/hashicorp/nomad/v2/ci" + client "github.com/hashicorp/nomad/v2/client/config" + "github.com/hashicorp/nomad/v2/client/fingerprint" + "github.com/hashicorp/nomad/v2/helper" + "github.com/hashicorp/nomad/v2/helper/testlog" + "github.com/hashicorp/nomad/v2/nomad" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" + sconfig "github.com/hashicorp/nomad/v2/nomad/structs/config" + "github.com/hashicorp/nomad/v2/testutil" ) // TempDir defines the base dir for temporary directories. diff --git a/command/agent/testingutils_test.go b/command/agent/testingutils_test.go index d436386541e..7747630ecff 100644 --- a/command/agent/testingutils_test.go +++ b/command/agent/testingutils_test.go @@ -7,7 +7,7 @@ import ( "time" "github.com/hashicorp/nomad/api" - "github.com/hashicorp/nomad/helper/uuid" + "github.com/hashicorp/nomad/v2/helper/uuid" ) func MockJob() *api.Job { diff --git a/command/agent/tls_metrics.go b/command/agent/tls_metrics.go index fafdb2bb41e..2f0a7c9dfe7 100644 --- a/command/agent/tls_metrics.go +++ b/command/agent/tls_metrics.go @@ -14,8 +14,8 @@ import ( "github.com/hashicorp/go-hclog" metrics "github.com/hashicorp/go-metrics/compat" - "github.com/hashicorp/nomad/helper" - "github.com/hashicorp/nomad/nomad/structs/config" + "github.com/hashicorp/nomad/v2/helper" + "github.com/hashicorp/nomad/v2/nomad/structs/config" ) // tlsMetrics emits metrics about TLS certificate expiry. It should be diff --git a/command/agent/tls_metrics_test.go b/command/agent/tls_metrics_test.go index e28fa957f9f..9064712fbc7 100644 --- a/command/agent/tls_metrics_test.go +++ b/command/agent/tls_metrics_test.go @@ -12,10 +12,10 @@ import ( "time" metrics "github.com/hashicorp/go-metrics/compat" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/helper/testlog" - "github.com/hashicorp/nomad/nomad/structs/config" - "github.com/hashicorp/nomad/testutil" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/helper/testlog" + "github.com/hashicorp/nomad/v2/nomad/structs/config" + "github.com/hashicorp/nomad/v2/testutil" "github.com/shoenig/test/must" ) diff --git a/command/agent/variable_endpoint.go b/command/agent/variable_endpoint.go index 8ddfa3ac319..ae1172a4523 100644 --- a/command/agent/variable_endpoint.go +++ b/command/agent/variable_endpoint.go @@ -11,7 +11,7 @@ import ( "strconv" "strings" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/nomad/structs" ) var ( diff --git a/command/agent/variable_endpoint_test.go b/command/agent/variable_endpoint_test.go index 7e08cd6335f..370a32ce485 100644 --- a/command/agent/variable_endpoint_test.go +++ b/command/agent/variable_endpoint_test.go @@ -13,9 +13,9 @@ import ( "net/http/httptest" "testing" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" "github.com/shoenig/test/must" "github.com/stretchr/testify/require" ) diff --git a/command/agent/volumes_endpoint.go b/command/agent/volumes_endpoint.go index 57c7eb11e1c..42d919e7faa 100644 --- a/command/agent/volumes_endpoint.go +++ b/command/agent/volumes_endpoint.go @@ -6,7 +6,7 @@ package agent import ( "net/http" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/nomad/structs" ) // ListVolumesRequest dispatches requests for listing volumes to a specific type. diff --git a/command/agent/websockets_test.go b/command/agent/websockets_test.go index a241d2db1cd..ae13e888a06 100644 --- a/command/agent/websockets_test.go +++ b/command/agent/websockets_test.go @@ -11,10 +11,10 @@ import ( "testing" "github.com/gorilla/websocket" - "github.com/hashicorp/nomad/ci" - cstructs "github.com/hashicorp/nomad/client/structs" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/ci" + cstructs "github.com/hashicorp/nomad/v2/client/structs" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/nomad/structs" "github.com/shoenig/test/must" ) diff --git a/command/agent_info_test.go b/command/agent_info_test.go index 2cb4a0af1bb..96a371c0a31 100644 --- a/command/agent_info_test.go +++ b/command/agent_info_test.go @@ -7,8 +7,8 @@ import ( "testing" "github.com/hashicorp/cli" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/command/agent" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/command/agent" "github.com/shoenig/test/must" ) diff --git a/command/agent_monitor_export_test.go b/command/agent_monitor_export_test.go index f40a7c14f27..6451febeb5e 100644 --- a/command/agent_monitor_export_test.go +++ b/command/agent_monitor_export_test.go @@ -9,8 +9,8 @@ import ( "testing" "github.com/hashicorp/cli" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/command/agent" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/command/agent" "github.com/shoenig/test/must" ) diff --git a/command/agent_monitor_test.go b/command/agent_monitor_test.go index c23827fd985..89548f43374 100644 --- a/command/agent_monitor_test.go +++ b/command/agent_monitor_test.go @@ -7,7 +7,7 @@ import ( "testing" "github.com/hashicorp/cli" - "github.com/hashicorp/nomad/ci" + "github.com/hashicorp/nomad/v2/ci" "github.com/shoenig/test/must" ) diff --git a/command/alloc_checks_test.go b/command/alloc_checks_test.go index 3af49d3498b..4c4f169cf45 100644 --- a/command/alloc_checks_test.go +++ b/command/alloc_checks_test.go @@ -9,9 +9,9 @@ import ( "github.com/hashicorp/cli" "github.com/hashicorp/nomad/api" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" "github.com/posener/complete" "github.com/shoenig/test/must" ) diff --git a/command/alloc_exec.go b/command/alloc_exec.go index 62f0841deca..b0aec395983 100644 --- a/command/alloc_exec.go +++ b/command/alloc_exec.go @@ -16,7 +16,7 @@ import ( "github.com/hashicorp/nomad/api" "github.com/hashicorp/nomad/api/contexts" - "github.com/hashicorp/nomad/helper/escapingio" + "github.com/hashicorp/nomad/v2/helper/escapingio" "github.com/moby/term" "github.com/posener/complete" ) diff --git a/command/alloc_exec_test.go b/command/alloc_exec_test.go index 446b595d674..08eb54a5468 100644 --- a/command/alloc_exec_test.go +++ b/command/alloc_exec_test.go @@ -10,11 +10,11 @@ import ( "testing" "github.com/hashicorp/cli" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/testutil" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/testutil" "github.com/posener/complete" "github.com/shoenig/test/must" ) diff --git a/command/alloc_fs_test.go b/command/alloc_fs_test.go index 63cb3c35315..f8ae2f49e59 100644 --- a/command/alloc_fs_test.go +++ b/command/alloc_fs_test.go @@ -7,9 +7,9 @@ import ( "testing" "github.com/hashicorp/cli" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" "github.com/posener/complete" "github.com/shoenig/test/must" ) diff --git a/command/alloc_logs.go b/command/alloc_logs.go index 2d095b0c8b0..69f38166afd 100644 --- a/command/alloc_logs.go +++ b/command/alloc_logs.go @@ -15,7 +15,7 @@ import ( "github.com/hashicorp/nomad/api" "github.com/hashicorp/nomad/api/contexts" - "github.com/hashicorp/nomad/command/ui" + "github.com/hashicorp/nomad/v2/command/ui" "github.com/posener/complete" ) diff --git a/command/alloc_logs_test.go b/command/alloc_logs_test.go index f577916b9c2..3e861b309aa 100644 --- a/command/alloc_logs_test.go +++ b/command/alloc_logs_test.go @@ -7,9 +7,9 @@ import ( "testing" "github.com/hashicorp/cli" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" "github.com/posener/complete" "github.com/shoenig/test/must" ) diff --git a/command/alloc_pause_test.go b/command/alloc_pause_test.go index 5a1a559591a..5d1a4daab87 100644 --- a/command/alloc_pause_test.go +++ b/command/alloc_pause_test.go @@ -7,7 +7,7 @@ import ( "testing" "github.com/hashicorp/cli" - "github.com/hashicorp/nomad/ci" + "github.com/hashicorp/nomad/v2/ci" ) func TestAllocPauseCommand_Implements(t *testing.T) { diff --git a/command/alloc_restart_test.go b/command/alloc_restart_test.go index 6ae30e98585..1542cba5de9 100644 --- a/command/alloc_restart_test.go +++ b/command/alloc_restart_test.go @@ -7,9 +7,9 @@ import ( "testing" "github.com/hashicorp/cli" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" "github.com/posener/complete" "github.com/shoenig/test/must" ) diff --git a/command/alloc_signal_test.go b/command/alloc_signal_test.go index 3aa6be05132..362181aa112 100644 --- a/command/alloc_signal_test.go +++ b/command/alloc_signal_test.go @@ -7,9 +7,9 @@ import ( "testing" "github.com/hashicorp/cli" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" "github.com/posener/complete" "github.com/shoenig/test/must" ) diff --git a/command/alloc_status_test.go b/command/alloc_status_test.go index 7ef00c14b23..d7ecd4d33b1 100644 --- a/command/alloc_status_test.go +++ b/command/alloc_status_test.go @@ -11,11 +11,11 @@ import ( "github.com/hashicorp/cli" "github.com/hashicorp/nomad/api" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/command/agent" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/command/agent" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" "github.com/posener/complete" "github.com/shoenig/test/must" ) diff --git a/command/alloc_stop_test.go b/command/alloc_stop_test.go index 79d4ca4e492..afe72487753 100644 --- a/command/alloc_stop_test.go +++ b/command/alloc_stop_test.go @@ -8,7 +8,7 @@ import ( "github.com/hashicorp/cli" "github.com/hashicorp/nomad/api" - "github.com/hashicorp/nomad/ci" + "github.com/hashicorp/nomad/v2/ci" "github.com/shoenig/test/must" ) diff --git a/command/check_test.go b/command/check_test.go index ce554011113..b60068df864 100644 --- a/command/check_test.go +++ b/command/check_test.go @@ -8,7 +8,7 @@ import ( "testing" "github.com/hashicorp/cli" - "github.com/hashicorp/nomad/ci" + "github.com/hashicorp/nomad/v2/ci" "github.com/shoenig/test/must" ) diff --git a/command/commands.go b/command/commands.go index 360a6c222e7..6795e5c2ebf 100644 --- a/command/commands.go +++ b/command/commands.go @@ -10,8 +10,8 @@ import ( "runtime" "github.com/hashicorp/cli" - "github.com/hashicorp/nomad/command/agent" - "github.com/hashicorp/nomad/version" + "github.com/hashicorp/nomad/v2/command/agent" + "github.com/hashicorp/nomad/v2/version" colorable "github.com/mattn/go-colorable" ) diff --git a/command/config_validate.go b/command/config_validate.go index fb71310a8e6..b6281741c21 100644 --- a/command/config_validate.go +++ b/command/config_validate.go @@ -9,7 +9,7 @@ import ( "strings" multierror "github.com/hashicorp/go-multierror" - agent "github.com/hashicorp/nomad/command/agent" + agent "github.com/hashicorp/nomad/v2/command/agent" ) type ConfigValidateCommand struct { diff --git a/command/config_validate_test.go b/command/config_validate_test.go index 9d613bc8c90..53c5194bc6e 100644 --- a/command/config_validate_test.go +++ b/command/config_validate_test.go @@ -9,7 +9,7 @@ import ( "testing" "github.com/hashicorp/cli" - "github.com/hashicorp/nomad/ci" + "github.com/hashicorp/nomad/v2/ci" "github.com/shoenig/test/must" ) diff --git a/command/data_format_test.go b/command/data_format_test.go index bf800ade6d0..1880e17eeeb 100644 --- a/command/data_format_test.go +++ b/command/data_format_test.go @@ -6,7 +6,7 @@ package command import ( "testing" - "github.com/hashicorp/nomad/ci" + "github.com/hashicorp/nomad/v2/ci" "github.com/shoenig/test/must" ) diff --git a/command/deployment_fail_test.go b/command/deployment_fail_test.go index 61c9b81e118..7801ae4bb8f 100644 --- a/command/deployment_fail_test.go +++ b/command/deployment_fail_test.go @@ -8,8 +8,8 @@ import ( "testing" "github.com/hashicorp/cli" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/nomad/mock" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/nomad/mock" "github.com/posener/complete" "github.com/shoenig/test/must" ) diff --git a/command/deployment_list_test.go b/command/deployment_list_test.go index de41eec7f93..ef228f4d0ac 100644 --- a/command/deployment_list_test.go +++ b/command/deployment_list_test.go @@ -8,7 +8,7 @@ import ( "testing" "github.com/hashicorp/cli" - "github.com/hashicorp/nomad/ci" + "github.com/hashicorp/nomad/v2/ci" ) func TestDeploymentListCommand_Implements(t *testing.T) { diff --git a/command/deployment_pause_test.go b/command/deployment_pause_test.go index 9909dc52f52..3cd386de5c7 100644 --- a/command/deployment_pause_test.go +++ b/command/deployment_pause_test.go @@ -8,8 +8,8 @@ import ( "testing" "github.com/hashicorp/cli" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/nomad/mock" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/nomad/mock" "github.com/posener/complete" "github.com/shoenig/test/must" ) diff --git a/command/deployment_promote.go b/command/deployment_promote.go index aafaf86ac09..4a988416778 100644 --- a/command/deployment_promote.go +++ b/command/deployment_promote.go @@ -9,7 +9,7 @@ import ( "github.com/hashicorp/nomad/api" "github.com/hashicorp/nomad/api/contexts" - flaghelper "github.com/hashicorp/nomad/helper/flags" + flaghelper "github.com/hashicorp/nomad/v2/helper/flags" "github.com/posener/complete" ) diff --git a/command/deployment_promote_test.go b/command/deployment_promote_test.go index e25a96b73a1..4bdb98893d5 100644 --- a/command/deployment_promote_test.go +++ b/command/deployment_promote_test.go @@ -8,8 +8,8 @@ import ( "testing" "github.com/hashicorp/cli" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/nomad/mock" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/nomad/mock" "github.com/posener/complete" "github.com/shoenig/test/must" ) diff --git a/command/deployment_resume_test.go b/command/deployment_resume_test.go index cec163f6bab..ea8be42b6e0 100644 --- a/command/deployment_resume_test.go +++ b/command/deployment_resume_test.go @@ -8,8 +8,8 @@ import ( "testing" "github.com/hashicorp/cli" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/nomad/mock" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/nomad/mock" "github.com/posener/complete" "github.com/shoenig/test/must" ) diff --git a/command/deployment_status.go b/command/deployment_status.go index 81855283a72..2a629bd45af 100644 --- a/command/deployment_status.go +++ b/command/deployment_status.go @@ -16,7 +16,7 @@ import ( "github.com/gosuri/uilive" "github.com/hashicorp/nomad/api" "github.com/hashicorp/nomad/api/contexts" - "github.com/hashicorp/nomad/helper" + "github.com/hashicorp/nomad/v2/helper" "github.com/mitchellh/go-glint" "github.com/mitchellh/go-glint/components" "github.com/moby/term" diff --git a/command/deployment_status_test.go b/command/deployment_status_test.go index 26cc12a9703..3af94a1a0b5 100644 --- a/command/deployment_status_test.go +++ b/command/deployment_status_test.go @@ -7,8 +7,8 @@ import ( "testing" "github.com/hashicorp/cli" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/nomad/mock" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/nomad/mock" "github.com/posener/complete" "github.com/shoenig/test/must" ) diff --git a/command/deployment_unblock_test.go b/command/deployment_unblock_test.go index 17147a7f372..43e2141fa42 100644 --- a/command/deployment_unblock_test.go +++ b/command/deployment_unblock_test.go @@ -8,8 +8,8 @@ import ( "testing" "github.com/hashicorp/cli" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/nomad/mock" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/nomad/mock" "github.com/posener/complete" "github.com/shoenig/test/must" ) diff --git a/command/eval_delete_test.go b/command/eval_delete_test.go index 62be1c9636e..77b73a67f07 100644 --- a/command/eval_delete_test.go +++ b/command/eval_delete_test.go @@ -9,7 +9,7 @@ import ( "testing" "github.com/hashicorp/cli" - "github.com/hashicorp/nomad/ci" + "github.com/hashicorp/nomad/v2/ci" "github.com/shoenig/test/must" ) diff --git a/command/eval_list_test.go b/command/eval_list_test.go index 793c59aed2d..4cd819851e7 100644 --- a/command/eval_list_test.go +++ b/command/eval_list_test.go @@ -7,7 +7,7 @@ import ( "strings" "testing" - "github.com/hashicorp/nomad/ci" + "github.com/hashicorp/nomad/v2/ci" "github.com/shoenig/test/must" ) diff --git a/command/eval_status_test.go b/command/eval_status_test.go index 56746f58f6a..358c5425b10 100644 --- a/command/eval_status_test.go +++ b/command/eval_status_test.go @@ -10,10 +10,10 @@ import ( "github.com/hashicorp/cli" "github.com/hashicorp/nomad/api" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" "github.com/posener/complete" "github.com/shoenig/test/must" ) diff --git a/command/fmt_test.go b/command/fmt_test.go index 426f9b3ea0b..8f3367354a2 100644 --- a/command/fmt_test.go +++ b/command/fmt_test.go @@ -11,7 +11,7 @@ import ( "testing" "github.com/hashicorp/cli" - "github.com/hashicorp/nomad/ci" + "github.com/hashicorp/nomad/v2/ci" "github.com/shoenig/test/must" ) diff --git a/command/helper_devices_test.go b/command/helper_devices_test.go index 1bce09b9954..37c731f697d 100644 --- a/command/helper_devices_test.go +++ b/command/helper_devices_test.go @@ -7,7 +7,7 @@ import ( "testing" "github.com/hashicorp/nomad/api" - "github.com/hashicorp/nomad/ci" + "github.com/hashicorp/nomad/v2/ci" "github.com/shoenig/test/must" ) diff --git a/command/helpers.go b/command/helpers.go index 35c0c722c7b..1a829dd4e48 100644 --- a/command/helpers.go +++ b/command/helpers.go @@ -21,8 +21,8 @@ import ( "github.com/hashicorp/cli" gg "github.com/hashicorp/go-getter" "github.com/hashicorp/nomad/api" - flaghelper "github.com/hashicorp/nomad/helper/flags" - "github.com/hashicorp/nomad/jobspec2" + flaghelper "github.com/hashicorp/nomad/v2/helper/flags" + "github.com/hashicorp/nomad/v2/jobspec2" "github.com/kr/text" "github.com/moby/term" "github.com/posener/complete" diff --git a/command/helpers_test.go b/command/helpers_test.go index c8fa205c4b9..cd577b86af3 100644 --- a/command/helpers_test.go +++ b/command/helpers_test.go @@ -18,9 +18,9 @@ import ( "github.com/hashicorp/cli" "github.com/hashicorp/nomad/api" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/client/testutil" - "github.com/hashicorp/nomad/helper/flatmap" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/client/testutil" + "github.com/hashicorp/nomad/v2/helper/flatmap" "github.com/kr/pretty" "github.com/shoenig/test/must" ) diff --git a/command/integration_test.go b/command/integration_test.go index fffac75f21b..f4480b8821a 100644 --- a/command/integration_test.go +++ b/command/integration_test.go @@ -12,8 +12,8 @@ import ( "testing" "github.com/hashicorp/nomad/api" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/client/testutil" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/client/testutil" "github.com/shoenig/test/must" ) diff --git a/command/job_action.go b/command/job_action.go index 2982f1bcbb4..08c66d040e1 100644 --- a/command/job_action.go +++ b/command/job_action.go @@ -14,7 +14,7 @@ import ( "syscall" "github.com/hashicorp/nomad/api" - "github.com/hashicorp/nomad/helper/escapingio" + "github.com/hashicorp/nomad/v2/helper/escapingio" "github.com/posener/complete" ) diff --git a/command/job_allocs_test.go b/command/job_allocs_test.go index 5c4d57f2ddb..8d6876fe99c 100644 --- a/command/job_allocs_test.go +++ b/command/job_allocs_test.go @@ -9,10 +9,10 @@ import ( "github.com/hashicorp/cli" "github.com/hashicorp/nomad/api" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/command/agent" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/command/agent" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" "github.com/posener/complete" "github.com/shoenig/test/must" ) diff --git a/command/job_deployments_test.go b/command/job_deployments_test.go index 288efb87e28..0655c01ba4c 100644 --- a/command/job_deployments_test.go +++ b/command/job_deployments_test.go @@ -9,10 +9,10 @@ import ( "github.com/hashicorp/cli" "github.com/hashicorp/nomad/api" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/command/agent" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/command/agent" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" "github.com/posener/complete" "github.com/shoenig/test/must" ) diff --git a/command/job_dispatch.go b/command/job_dispatch.go index 098a3e4512e..2f4b09cd5a8 100644 --- a/command/job_dispatch.go +++ b/command/job_dispatch.go @@ -15,7 +15,7 @@ import ( "time" "github.com/hashicorp/nomad/api" - flaghelper "github.com/hashicorp/nomad/helper/flags" + flaghelper "github.com/hashicorp/nomad/v2/helper/flags" "github.com/mitchellh/go-glint" "github.com/mitchellh/go-glint/components" "github.com/posener/complete" diff --git a/command/job_dispatch_test.go b/command/job_dispatch_test.go index 88cefaadd62..c4f92b0e7a6 100644 --- a/command/job_dispatch_test.go +++ b/command/job_dispatch_test.go @@ -11,10 +11,10 @@ import ( "github.com/hashicorp/cli" "github.com/hashicorp/nomad/api" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/command/agent" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/command/agent" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" "github.com/posener/complete" "github.com/shoenig/test/must" ) diff --git a/command/job_eval_test.go b/command/job_eval_test.go index cd251d943e9..4c4b1542a95 100644 --- a/command/job_eval_test.go +++ b/command/job_eval_test.go @@ -10,11 +10,11 @@ import ( "github.com/hashicorp/cli" "github.com/hashicorp/nomad/api" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/command/agent" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/testutil" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/command/agent" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/testutil" "github.com/posener/complete" "github.com/shoenig/test/must" ) diff --git a/command/job_history_test.go b/command/job_history_test.go index 4e00785f097..1272305178a 100644 --- a/command/job_history_test.go +++ b/command/job_history_test.go @@ -9,10 +9,10 @@ import ( "github.com/hashicorp/cli" "github.com/hashicorp/nomad/api" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/command/agent" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/command/agent" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" "github.com/posener/complete" "github.com/shoenig/test/must" ) diff --git a/command/job_init.go b/command/job_init.go index 851084f1e00..771e2d376e9 100644 --- a/command/job_init.go +++ b/command/job_init.go @@ -9,7 +9,7 @@ import ( "strings" "github.com/hashicorp/nomad/api" - "github.com/hashicorp/nomad/command/asset" + "github.com/hashicorp/nomad/v2/command/asset" "github.com/posener/complete" ) diff --git a/command/job_init_test.go b/command/job_init_test.go index 8e159da27f7..7aef078748c 100644 --- a/command/job_init_test.go +++ b/command/job_init_test.go @@ -10,8 +10,8 @@ import ( "testing" "github.com/hashicorp/cli" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/command/asset" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/command/asset" "github.com/shoenig/test/must" ) diff --git a/command/job_inspect_test.go b/command/job_inspect_test.go index 06182629323..84ab5cb6467 100644 --- a/command/job_inspect_test.go +++ b/command/job_inspect_test.go @@ -11,11 +11,11 @@ import ( "github.com/hashicorp/cli" "github.com/hashicorp/nomad/api" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/command/agent" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/command/agent" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" "github.com/posener/complete" "github.com/shoenig/test/must" ) diff --git a/command/job_periodic_force_test.go b/command/job_periodic_force_test.go index bba91a0f3e8..cb550fdf651 100644 --- a/command/job_periodic_force_test.go +++ b/command/job_periodic_force_test.go @@ -9,11 +9,11 @@ import ( "github.com/hashicorp/cli" "github.com/hashicorp/nomad/api" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/command/agent" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/testutil" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/command/agent" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/testutil" "github.com/posener/complete" "github.com/shoenig/test/must" ) diff --git a/command/job_plan.go b/command/job_plan.go index c9a21c49aad..90ff8deed05 100644 --- a/command/job_plan.go +++ b/command/job_plan.go @@ -10,7 +10,7 @@ import ( "time" "github.com/hashicorp/nomad/api" - "github.com/hashicorp/nomad/scheduler" + "github.com/hashicorp/nomad/v2/scheduler" "github.com/mitchellh/colorstring" "github.com/posener/complete" ) diff --git a/command/job_plan_test.go b/command/job_plan_test.go index 2b6ecb45b4a..3997713101f 100644 --- a/command/job_plan_test.go +++ b/command/job_plan_test.go @@ -11,8 +11,8 @@ import ( "github.com/hashicorp/cli" "github.com/hashicorp/nomad/api" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/testutil" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/testutil" "github.com/shoenig/test/must" ) diff --git a/command/job_promote.go b/command/job_promote.go index 25de3cef1a7..2904a0f0762 100644 --- a/command/job_promote.go +++ b/command/job_promote.go @@ -8,7 +8,7 @@ import ( "strings" "github.com/hashicorp/nomad/api" - flaghelper "github.com/hashicorp/nomad/helper/flags" + flaghelper "github.com/hashicorp/nomad/v2/helper/flags" "github.com/posener/complete" ) diff --git a/command/job_promote_test.go b/command/job_promote_test.go index 7ac3202bc67..9f6b98a9852 100644 --- a/command/job_promote_test.go +++ b/command/job_promote_test.go @@ -9,10 +9,10 @@ import ( "github.com/hashicorp/cli" "github.com/hashicorp/nomad/api" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/command/agent" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/command/agent" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" "github.com/posener/complete" "github.com/shoenig/test/must" ) diff --git a/command/job_restart_test.go b/command/job_restart_test.go index bfc51cdbdcc..e1a72577de2 100644 --- a/command/job_restart_test.go +++ b/command/job_restart_test.go @@ -21,9 +21,9 @@ import ( "github.com/hashicorp/cli" "github.com/hashicorp/go-set/v3" "github.com/hashicorp/nomad/api" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/command/agent" - "github.com/hashicorp/nomad/testutil" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/command/agent" + "github.com/hashicorp/nomad/v2/testutil" "github.com/shoenig/test/must" "github.com/shoenig/test/wait" ) diff --git a/command/job_revert_test.go b/command/job_revert_test.go index 6f66d8694b0..7716216134a 100644 --- a/command/job_revert_test.go +++ b/command/job_revert_test.go @@ -9,10 +9,10 @@ import ( "github.com/hashicorp/cli" "github.com/hashicorp/nomad/api" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/command/agent" - "github.com/hashicorp/nomad/nomad/mock" - structs "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/command/agent" + "github.com/hashicorp/nomad/v2/nomad/mock" + structs "github.com/hashicorp/nomad/v2/nomad/structs" "github.com/posener/complete" "github.com/shoenig/test/must" ) diff --git a/command/job_run_test.go b/command/job_run_test.go index 0af85c1ed0e..7150557236d 100644 --- a/command/job_run_test.go +++ b/command/job_run_test.go @@ -13,8 +13,8 @@ import ( "time" "github.com/hashicorp/cli" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/testutil" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/testutil" "github.com/shoenig/test/must" ) diff --git a/command/job_scale_test.go b/command/job_scale_test.go index 065fd256672..bf102a8dde7 100644 --- a/command/job_scale_test.go +++ b/command/job_scale_test.go @@ -10,11 +10,11 @@ import ( "github.com/hashicorp/cli" "github.com/hashicorp/nomad/api" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/command/agent" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/testutil" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/command/agent" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/testutil" "github.com/shoenig/test/must" ) diff --git a/command/job_scaling_events_test.go b/command/job_scaling_events_test.go index 2d26f174ed5..410cdf3c433 100644 --- a/command/job_scaling_events_test.go +++ b/command/job_scaling_events_test.go @@ -10,11 +10,11 @@ import ( "github.com/hashicorp/cli" "github.com/hashicorp/nomad/api" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/command/agent" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/testutil" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/command/agent" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/testutil" "github.com/shoenig/test/must" ) diff --git a/command/job_start.go b/command/job_start.go index 61ff93b0892..f2673a0736e 100644 --- a/command/job_start.go +++ b/command/job_start.go @@ -10,7 +10,7 @@ import ( "time" "github.com/hashicorp/nomad/api" - "github.com/hashicorp/nomad/jobspec2" + "github.com/hashicorp/nomad/v2/jobspec2" "github.com/posener/complete" ) diff --git a/command/job_start_test.go b/command/job_start_test.go index 6b69ea54e03..9e2758141be 100644 --- a/command/job_start_test.go +++ b/command/job_start_test.go @@ -9,11 +9,11 @@ import ( "github.com/hashicorp/cli" "github.com/hashicorp/nomad/api" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/command/agent" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/command/agent" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" "github.com/posener/complete" "github.com/shoenig/test/must" ) diff --git a/command/job_status_test.go b/command/job_status_test.go index c8e565a93db..c8134eef928 100644 --- a/command/job_status_test.go +++ b/command/job_status_test.go @@ -12,11 +12,11 @@ import ( "github.com/hashicorp/cli" "github.com/hashicorp/nomad/api" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/command/agent" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/testutil" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/command/agent" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/testutil" "github.com/posener/complete" "github.com/shoenig/test/must" ) diff --git a/command/job_stop_test.go b/command/job_stop_test.go index ed087a58573..fd03f3ffe7a 100644 --- a/command/job_stop_test.go +++ b/command/job_stop_test.go @@ -11,11 +11,11 @@ import ( "github.com/hashicorp/cli" "github.com/hashicorp/nomad/api" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/command/agent" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/command/agent" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" "github.com/posener/complete" "github.com/shoenig/test/must" ) diff --git a/command/job_tag_test.go b/command/job_tag_test.go index 5a0d92de12f..243afc8c8d2 100644 --- a/command/job_tag_test.go +++ b/command/job_tag_test.go @@ -7,9 +7,9 @@ import ( "testing" "github.com/hashicorp/cli" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" "github.com/shoenig/test/must" ) diff --git a/command/job_validate.go b/command/job_validate.go index df060baf800..470ef6a86c3 100644 --- a/command/job_validate.go +++ b/command/job_validate.go @@ -9,8 +9,8 @@ import ( "github.com/hashicorp/go-multierror" "github.com/hashicorp/nomad/api" - "github.com/hashicorp/nomad/command/agent" - "github.com/hashicorp/nomad/helper" + "github.com/hashicorp/nomad/v2/command/agent" + "github.com/hashicorp/nomad/v2/helper" "github.com/posener/complete" ) diff --git a/command/job_validate_test.go b/command/job_validate_test.go index b33f77766b4..5d3123fdaa3 100644 --- a/command/job_validate_test.go +++ b/command/job_validate_test.go @@ -9,8 +9,8 @@ import ( "testing" "github.com/hashicorp/cli" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/testutil" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/testutil" "github.com/shoenig/test/must" ) diff --git a/command/license_get_test.go b/command/license_get_test.go index e07a8935c10..55a387ce96d 100644 --- a/command/license_get_test.go +++ b/command/license_get_test.go @@ -9,7 +9,7 @@ import ( "github.com/hashicorp/cli" "github.com/hashicorp/nomad/api" - "github.com/hashicorp/nomad/ci" + "github.com/hashicorp/nomad/v2/ci" "github.com/shoenig/test/must" ) diff --git a/command/login.go b/command/login.go index 8260b0683b2..e71da910a92 100644 --- a/command/login.go +++ b/command/login.go @@ -15,7 +15,7 @@ import ( "github.com/posener/complete" "github.com/hashicorp/nomad/api" - "github.com/hashicorp/nomad/lib/auth/oidc" + "github.com/hashicorp/nomad/v2/lib/auth/oidc" ) // Ensure LoginCommand satisfies the cli.Command interface. diff --git a/command/login_test.go b/command/login_test.go index d7c35cf518e..b586aecff02 100644 --- a/command/login_test.go +++ b/command/login_test.go @@ -7,10 +7,10 @@ import ( "testing" "github.com/hashicorp/cli" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/command/agent" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/testutil" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/command/agent" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/testutil" "github.com/shoenig/test/must" ) diff --git a/command/meta_test.go b/command/meta_test.go index 6005a79e198..2ee79e1e1a1 100644 --- a/command/meta_test.go +++ b/command/meta_test.go @@ -17,8 +17,8 @@ import ( "github.com/creack/pty" "github.com/hashicorp/cli" "github.com/hashicorp/nomad/api" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/command/agent" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/command/agent" "github.com/shoenig/test/must" ) diff --git a/command/metrics_test.go b/command/metrics_test.go index 1b99568724b..fb1fd0f6514 100644 --- a/command/metrics_test.go +++ b/command/metrics_test.go @@ -7,7 +7,7 @@ import ( "testing" "github.com/hashicorp/cli" - "github.com/hashicorp/nomad/ci" + "github.com/hashicorp/nomad/v2/ci" "github.com/shoenig/test/must" ) diff --git a/command/monitor_test.go b/command/monitor_test.go index 379f4080f9f..dec8b3fc4cf 100644 --- a/command/monitor_test.go +++ b/command/monitor_test.go @@ -11,8 +11,8 @@ import ( "github.com/hashicorp/cli" "github.com/hashicorp/nomad/api" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/nomad/structs" "github.com/shoenig/test/must" "github.com/shoenig/test/wait" ) diff --git a/command/namespace_apply.go b/command/namespace_apply.go index 6991c3be977..71f99428d1c 100644 --- a/command/namespace_apply.go +++ b/command/namespace_apply.go @@ -15,7 +15,7 @@ import ( "github.com/hashicorp/hcl" "github.com/hashicorp/hcl/hcl/ast" "github.com/hashicorp/nomad/api" - flaghelper "github.com/hashicorp/nomad/helper/flags" + flaghelper "github.com/hashicorp/nomad/v2/helper/flags" "github.com/posener/complete" ) diff --git a/command/namespace_apply_test.go b/command/namespace_apply_test.go index 50d7eecbbdf..1a82a6693d9 100644 --- a/command/namespace_apply_test.go +++ b/command/namespace_apply_test.go @@ -9,7 +9,7 @@ import ( "github.com/hashicorp/cli" "github.com/hashicorp/nomad/api" - "github.com/hashicorp/nomad/ci" + "github.com/hashicorp/nomad/v2/ci" "github.com/shoenig/test/must" ) diff --git a/command/namespace_delete_test.go b/command/namespace_delete_test.go index c026484b432..8112087080e 100644 --- a/command/namespace_delete_test.go +++ b/command/namespace_delete_test.go @@ -9,7 +9,7 @@ import ( "github.com/hashicorp/cli" "github.com/hashicorp/nomad/api" - "github.com/hashicorp/nomad/ci" + "github.com/hashicorp/nomad/v2/ci" "github.com/posener/complete" "github.com/shoenig/test/must" ) diff --git a/command/namespace_inspect_test.go b/command/namespace_inspect_test.go index 6ad93e85acd..de707cc6676 100644 --- a/command/namespace_inspect_test.go +++ b/command/namespace_inspect_test.go @@ -9,7 +9,7 @@ import ( "github.com/hashicorp/cli" "github.com/hashicorp/nomad/api" - "github.com/hashicorp/nomad/ci" + "github.com/hashicorp/nomad/v2/ci" "github.com/posener/complete" "github.com/shoenig/test/must" ) diff --git a/command/namespace_list_test.go b/command/namespace_list_test.go index acd4a0a2cc4..4affb9f0ccd 100644 --- a/command/namespace_list_test.go +++ b/command/namespace_list_test.go @@ -8,7 +8,7 @@ import ( "testing" "github.com/hashicorp/cli" - "github.com/hashicorp/nomad/ci" + "github.com/hashicorp/nomad/v2/ci" ) var _ cli.Command = (*NamespaceListCommand)(nil) diff --git a/command/namespace_status_test.go b/command/namespace_status_test.go index 32927377404..d8552433162 100644 --- a/command/namespace_status_test.go +++ b/command/namespace_status_test.go @@ -10,7 +10,7 @@ import ( "github.com/hashicorp/cli" "github.com/hashicorp/nomad/api" - "github.com/hashicorp/nomad/ci" + "github.com/hashicorp/nomad/v2/ci" "github.com/posener/complete" "github.com/shoenig/test/must" ) diff --git a/command/node_config_test.go b/command/node_config_test.go index 189fb1227c8..e729437bd96 100644 --- a/command/node_config_test.go +++ b/command/node_config_test.go @@ -8,8 +8,8 @@ import ( "testing" "github.com/hashicorp/cli" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/command/agent" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/command/agent" ) func TestClientConfigCommand_Implements(t *testing.T) { diff --git a/command/node_drain.go b/command/node_drain.go index 1e4cf990979..3d054fc9419 100644 --- a/command/node_drain.go +++ b/command/node_drain.go @@ -11,7 +11,7 @@ import ( "github.com/hashicorp/nomad/api" "github.com/hashicorp/nomad/api/contexts" - flaghelper "github.com/hashicorp/nomad/helper/flags" + flaghelper "github.com/hashicorp/nomad/v2/helper/flags" "github.com/posener/complete" ) diff --git a/command/node_drain_test.go b/command/node_drain_test.go index 4e76612c83e..3bb2a6c5d83 100644 --- a/command/node_drain_test.go +++ b/command/node_drain_test.go @@ -12,9 +12,9 @@ import ( "github.com/hashicorp/cli" "github.com/hashicorp/nomad/api" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/command/agent" - "github.com/hashicorp/nomad/testutil" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/command/agent" + "github.com/hashicorp/nomad/v2/testutil" "github.com/posener/complete" "github.com/shoenig/test/must" ) diff --git a/command/node_eligibility_test.go b/command/node_eligibility_test.go index aa93728dece..8ae9e1cb789 100644 --- a/command/node_eligibility_test.go +++ b/command/node_eligibility_test.go @@ -9,8 +9,8 @@ import ( "testing" "github.com/hashicorp/cli" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/testutil" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/testutil" "github.com/posener/complete" "github.com/shoenig/test/must" ) diff --git a/command/node_identity_get_test.go b/command/node_identity_get_test.go index 8e115085d89..cec6db63ce5 100644 --- a/command/node_identity_get_test.go +++ b/command/node_identity_get_test.go @@ -8,8 +8,8 @@ import ( "testing" "github.com/hashicorp/cli" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/testutil" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/testutil" "github.com/shoenig/test/must" ) diff --git a/command/node_intro_create_test.go b/command/node_intro_create_test.go index c6802d5f4ff..4919bd9c89f 100644 --- a/command/node_intro_create_test.go +++ b/command/node_intro_create_test.go @@ -9,8 +9,8 @@ import ( "github.com/hashicorp/cli" "github.com/hashicorp/nomad/api" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/testutil" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/testutil" "github.com/shoenig/test/must" ) diff --git a/command/node_intro_test.go b/command/node_intro_test.go index 6a3995795a4..9d819e0a169 100644 --- a/command/node_intro_test.go +++ b/command/node_intro_test.go @@ -7,7 +7,7 @@ import ( "testing" "github.com/hashicorp/cli" - "github.com/hashicorp/nomad/ci" + "github.com/hashicorp/nomad/v2/ci" ) func TestNodeIntroCommand_Implements(t *testing.T) { diff --git a/command/node_meta_apply_test.go b/command/node_meta_apply_test.go index b724a61eaf5..a14d02d8197 100644 --- a/command/node_meta_apply_test.go +++ b/command/node_meta_apply_test.go @@ -6,7 +6,7 @@ package command import ( "testing" - "github.com/hashicorp/nomad/ci" + "github.com/hashicorp/nomad/v2/ci" "github.com/shoenig/test/must" ) diff --git a/command/node_pool_apply.go b/command/node_pool_apply.go index 8bf6943a911..d2a1e91b7fa 100644 --- a/command/node_pool_apply.go +++ b/command/node_pool_apply.go @@ -11,7 +11,7 @@ import ( "strings" "github.com/hashicorp/nomad/api" - "github.com/hashicorp/nomad/helper/hcl" + "github.com/hashicorp/nomad/v2/helper/hcl" "github.com/posener/complete" ) diff --git a/command/node_pool_apply_test.go b/command/node_pool_apply_test.go index 2611159074f..52b842b23bd 100644 --- a/command/node_pool_apply_test.go +++ b/command/node_pool_apply_test.go @@ -12,7 +12,7 @@ import ( "time" "github.com/hashicorp/cli" - "github.com/hashicorp/nomad/ci" + "github.com/hashicorp/nomad/v2/ci" "github.com/shoenig/test" "github.com/shoenig/test/must" ) diff --git a/command/node_pool_delete_test.go b/command/node_pool_delete_test.go index 4a7147bdee6..d6109881143 100644 --- a/command/node_pool_delete_test.go +++ b/command/node_pool_delete_test.go @@ -8,7 +8,7 @@ import ( "github.com/hashicorp/cli" "github.com/hashicorp/nomad/api" - "github.com/hashicorp/nomad/ci" + "github.com/hashicorp/nomad/v2/ci" "github.com/shoenig/test/must" ) diff --git a/command/node_pool_info_test.go b/command/node_pool_info_test.go index 294385266f9..27f0ba01295 100644 --- a/command/node_pool_info_test.go +++ b/command/node_pool_info_test.go @@ -10,7 +10,7 @@ import ( "github.com/hashicorp/cli" "github.com/hashicorp/nomad/api" - "github.com/hashicorp/nomad/ci" + "github.com/hashicorp/nomad/v2/ci" "github.com/shoenig/test" "github.com/shoenig/test/must" ) diff --git a/command/node_pool_init.go b/command/node_pool_init.go index 9a193bf1219..63a8752e25f 100644 --- a/command/node_pool_init.go +++ b/command/node_pool_init.go @@ -10,7 +10,7 @@ import ( "os" "strings" - "github.com/hashicorp/nomad/command/asset" + "github.com/hashicorp/nomad/v2/command/asset" "github.com/posener/complete" ) diff --git a/command/node_pool_init_test.go b/command/node_pool_init_test.go index e9c14a9f8c7..e2be61ee8c6 100644 --- a/command/node_pool_init_test.go +++ b/command/node_pool_init_test.go @@ -11,8 +11,8 @@ import ( "github.com/hashicorp/cli" "github.com/shoenig/test/must" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/command/asset" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/command/asset" ) func TestNodePoolInitCommand_Implements(t *testing.T) { diff --git a/command/node_pool_jobs_test.go b/command/node_pool_jobs_test.go index 9a92868b9d5..b169c8fee13 100644 --- a/command/node_pool_jobs_test.go +++ b/command/node_pool_jobs_test.go @@ -10,8 +10,8 @@ import ( "github.com/hashicorp/cli" "github.com/hashicorp/nomad/api" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/helper" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/helper" "github.com/shoenig/test" "github.com/shoenig/test/must" ) diff --git a/command/node_pool_list_test.go b/command/node_pool_list_test.go index 483c70cbfa7..310f3bcef0e 100644 --- a/command/node_pool_list_test.go +++ b/command/node_pool_list_test.go @@ -9,7 +9,7 @@ import ( "github.com/hashicorp/cli" "github.com/hashicorp/nomad/api" - "github.com/hashicorp/nomad/ci" + "github.com/hashicorp/nomad/v2/ci" "github.com/shoenig/test" "github.com/shoenig/test/must" ) diff --git a/command/node_pool_nodes_test.go b/command/node_pool_nodes_test.go index fabf34481a6..01a62094d68 100644 --- a/command/node_pool_nodes_test.go +++ b/command/node_pool_nodes_test.go @@ -11,10 +11,10 @@ import ( "github.com/hashicorp/cli" "github.com/hashicorp/nomad/api" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/command/agent" - "github.com/hashicorp/nomad/helper" - "github.com/hashicorp/nomad/testutil" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/command/agent" + "github.com/hashicorp/nomad/v2/helper" + "github.com/hashicorp/nomad/v2/testutil" "github.com/shoenig/test/must" ) diff --git a/command/node_pool_test.go b/command/node_pool_test.go index e8f2d6be3dc..3fca1df64e5 100644 --- a/command/node_pool_test.go +++ b/command/node_pool_test.go @@ -10,7 +10,7 @@ import ( "github.com/hashicorp/cli" "github.com/hashicorp/go-set/v3" "github.com/hashicorp/nomad/api" - "github.com/hashicorp/nomad/ci" + "github.com/hashicorp/nomad/v2/ci" "github.com/posener/complete" "github.com/shoenig/test/must" ) diff --git a/command/node_status_test.go b/command/node_status_test.go index 0e062ed0330..4cc2e322c1f 100644 --- a/command/node_status_test.go +++ b/command/node_status_test.go @@ -11,9 +11,9 @@ import ( "github.com/hashicorp/cli" "github.com/hashicorp/nomad/api" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/command/agent" - "github.com/hashicorp/nomad/testutil" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/command/agent" + "github.com/hashicorp/nomad/v2/testutil" "github.com/posener/complete" "github.com/shoenig/test/must" ) diff --git a/command/operator_api_test.go b/command/operator_api_test.go index dfa8434ef57..cab5da53a70 100644 --- a/command/operator_api_test.go +++ b/command/operator_api_test.go @@ -17,7 +17,7 @@ import ( "github.com/hashicorp/cli" "github.com/hashicorp/nomad/api" - "github.com/hashicorp/nomad/ci" + "github.com/hashicorp/nomad/v2/ci" "github.com/shoenig/test/must" ) diff --git a/command/operator_autopilot_get_test.go b/command/operator_autopilot_get_test.go index be8acedf00c..10a5c498770 100644 --- a/command/operator_autopilot_get_test.go +++ b/command/operator_autopilot_get_test.go @@ -10,7 +10,7 @@ import ( "github.com/hashicorp/cli" "github.com/hashicorp/nomad/api" - "github.com/hashicorp/nomad/ci" + "github.com/hashicorp/nomad/v2/ci" "github.com/shoenig/test/must" ) diff --git a/command/operator_autopilot_health_test.go b/command/operator_autopilot_health_test.go index f43efdcd0c8..1b44724af08 100644 --- a/command/operator_autopilot_health_test.go +++ b/command/operator_autopilot_health_test.go @@ -9,7 +9,7 @@ import ( "github.com/hashicorp/cli" "github.com/hashicorp/nomad/api" - "github.com/hashicorp/nomad/ci" + "github.com/hashicorp/nomad/v2/ci" "github.com/shoenig/test/must" ) diff --git a/command/operator_autopilot_set.go b/command/operator_autopilot_set.go index 6275a84a52a..9194ce01a1d 100644 --- a/command/operator_autopilot_set.go +++ b/command/operator_autopilot_set.go @@ -7,7 +7,7 @@ import ( "fmt" "strings" - flaghelper "github.com/hashicorp/nomad/helper/flags" + flaghelper "github.com/hashicorp/nomad/v2/helper/flags" "github.com/posener/complete" ) diff --git a/command/operator_autopilot_set_test.go b/command/operator_autopilot_set_test.go index 34dc9774721..36ba1923dff 100644 --- a/command/operator_autopilot_set_test.go +++ b/command/operator_autopilot_set_test.go @@ -9,7 +9,7 @@ import ( "time" "github.com/hashicorp/cli" - "github.com/hashicorp/nomad/ci" + "github.com/hashicorp/nomad/v2/ci" "github.com/shoenig/test/must" ) diff --git a/command/operator_autopilot_test.go b/command/operator_autopilot_test.go index af2c1058cae..cff26ebeb92 100644 --- a/command/operator_autopilot_test.go +++ b/command/operator_autopilot_test.go @@ -7,7 +7,7 @@ import ( "testing" "github.com/hashicorp/cli" - "github.com/hashicorp/nomad/ci" + "github.com/hashicorp/nomad/v2/ci" ) func TestOperator_Autopilot_Implements(t *testing.T) { diff --git a/command/operator_client_state.go b/command/operator_client_state.go index 6af8e2f8696..0eb9287bbc3 100644 --- a/command/operator_client_state.go +++ b/command/operator_client_state.go @@ -9,8 +9,8 @@ import ( "strings" "github.com/hashicorp/go-hclog" - trstate "github.com/hashicorp/nomad/client/allocrunner/taskrunner/state" - "github.com/hashicorp/nomad/client/state" + trstate "github.com/hashicorp/nomad/v2/client/allocrunner/taskrunner/state" + "github.com/hashicorp/nomad/v2/client/state" "github.com/posener/complete" ) diff --git a/command/operator_client_state_test.go b/command/operator_client_state_test.go index d01e591c682..e35b1de3549 100644 --- a/command/operator_client_state_test.go +++ b/command/operator_client_state_test.go @@ -7,10 +7,10 @@ import ( "testing" "github.com/hashicorp/cli" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/client/state" - "github.com/hashicorp/nomad/helper/testlog" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/client/state" + "github.com/hashicorp/nomad/v2/helper/testlog" + "github.com/hashicorp/nomad/v2/nomad/structs" "github.com/shoenig/test/must" ) diff --git a/command/operator_debug.go b/command/operator_debug.go index 0ad27e8bb47..faa1bd26397 100644 --- a/command/operator_debug.go +++ b/command/operator_debug.go @@ -30,9 +30,9 @@ import ( goversion "github.com/hashicorp/go-version" "github.com/hashicorp/nomad/api" "github.com/hashicorp/nomad/api/contexts" - "github.com/hashicorp/nomad/helper" - "github.com/hashicorp/nomad/helper/escapingfs" - "github.com/hashicorp/nomad/version" + "github.com/hashicorp/nomad/v2/helper" + "github.com/hashicorp/nomad/v2/helper/escapingfs" + "github.com/hashicorp/nomad/v2/version" "github.com/posener/complete" "golang.org/x/text/cases" "golang.org/x/text/language" diff --git a/command/operator_debug_test.go b/command/operator_debug_test.go index 42dda8ff2b7..242b7674fe7 100644 --- a/command/operator_debug_test.go +++ b/command/operator_debug_test.go @@ -21,13 +21,13 @@ import ( consulapi "github.com/hashicorp/consul/api" consultest "github.com/hashicorp/consul/sdk/testutil" "github.com/hashicorp/nomad/api" - "github.com/hashicorp/nomad/ci" - clienttest "github.com/hashicorp/nomad/client/testutil" - "github.com/hashicorp/nomad/command/agent" - mon "github.com/hashicorp/nomad/command/agent/monitor" - "github.com/hashicorp/nomad/helper" - "github.com/hashicorp/nomad/nomad/state" - "github.com/hashicorp/nomad/testutil" + "github.com/hashicorp/nomad/v2/ci" + clienttest "github.com/hashicorp/nomad/v2/client/testutil" + "github.com/hashicorp/nomad/v2/command/agent" + mon "github.com/hashicorp/nomad/v2/command/agent/monitor" + "github.com/hashicorp/nomad/v2/helper" + "github.com/hashicorp/nomad/v2/nomad/state" + "github.com/hashicorp/nomad/v2/testutil" "github.com/shoenig/test/must" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/command/operator_gossip_keyring_test.go b/command/operator_gossip_keyring_test.go index f5686f5d396..9f126162967 100644 --- a/command/operator_gossip_keyring_test.go +++ b/command/operator_gossip_keyring_test.go @@ -8,7 +8,7 @@ import ( "testing" "github.com/hashicorp/cli" - "github.com/hashicorp/nomad/ci" + "github.com/hashicorp/nomad/v2/ci" "github.com/shoenig/test/must" ) diff --git a/command/operator_raft_info.go b/command/operator_raft_info.go index 18f5336cf36..2d831a33714 100644 --- a/command/operator_raft_info.go +++ b/command/operator_raft_info.go @@ -7,7 +7,7 @@ import ( "fmt" "strings" - "github.com/hashicorp/nomad/helper/raftutil" + "github.com/hashicorp/nomad/v2/helper/raftutil" "github.com/posener/complete" ) diff --git a/command/operator_raft_list_test.go b/command/operator_raft_list_test.go index 6e5dd5e770d..377c73b9f0e 100644 --- a/command/operator_raft_list_test.go +++ b/command/operator_raft_list_test.go @@ -8,7 +8,7 @@ import ( "testing" "github.com/hashicorp/cli" - "github.com/hashicorp/nomad/ci" + "github.com/hashicorp/nomad/v2/ci" ) func TestOperator_Raft_ListPeers_Implements(t *testing.T) { diff --git a/command/operator_raft_logs.go b/command/operator_raft_logs.go index 579defe09f5..09448cbc893 100644 --- a/command/operator_raft_logs.go +++ b/command/operator_raft_logs.go @@ -9,7 +9,7 @@ import ( "os" "strings" - "github.com/hashicorp/nomad/helper/raftutil" + "github.com/hashicorp/nomad/v2/helper/raftutil" "github.com/posener/complete" ) diff --git a/command/operator_raft_migrate.go b/command/operator_raft_migrate.go index 57b24897fc5..9ad72eb4ebb 100644 --- a/command/operator_raft_migrate.go +++ b/command/operator_raft_migrate.go @@ -8,7 +8,7 @@ import ( "fmt" "strings" - "github.com/hashicorp/nomad/helper/raftutil" + "github.com/hashicorp/nomad/v2/helper/raftutil" "github.com/posener/complete" ) diff --git a/command/operator_raft_remove_test.go b/command/operator_raft_remove_test.go index b96fe0ac149..aa5cb925a19 100644 --- a/command/operator_raft_remove_test.go +++ b/command/operator_raft_remove_test.go @@ -7,7 +7,7 @@ import ( "testing" "github.com/hashicorp/cli" - "github.com/hashicorp/nomad/ci" + "github.com/hashicorp/nomad/v2/ci" "github.com/shoenig/test/must" ) diff --git a/command/operator_raft_state.go b/command/operator_raft_state.go index 1afd53cb2b3..16344e39750 100644 --- a/command/operator_raft_state.go +++ b/command/operator_raft_state.go @@ -9,7 +9,7 @@ import ( "os" "strings" - "github.com/hashicorp/nomad/helper/raftutil" + "github.com/hashicorp/nomad/v2/helper/raftutil" "github.com/posener/complete" ) diff --git a/command/operator_raft_test.go b/command/operator_raft_test.go index 738802f6a19..b22bb88d8a8 100644 --- a/command/operator_raft_test.go +++ b/command/operator_raft_test.go @@ -7,7 +7,7 @@ import ( "testing" "github.com/hashicorp/cli" - "github.com/hashicorp/nomad/ci" + "github.com/hashicorp/nomad/v2/ci" ) func TestOperator_Raft_Implements(t *testing.T) { diff --git a/command/operator_scheduler_get_config_test.go b/command/operator_scheduler_get_config_test.go index 8517554fcc2..0e5a0e41d90 100644 --- a/command/operator_scheduler_get_config_test.go +++ b/command/operator_scheduler_get_config_test.go @@ -9,7 +9,7 @@ import ( "github.com/hashicorp/cli" "github.com/hashicorp/nomad/api" - "github.com/hashicorp/nomad/ci" + "github.com/hashicorp/nomad/v2/ci" "github.com/shoenig/test/must" ) diff --git a/command/operator_scheduler_set_config.go b/command/operator_scheduler_set_config.go index 8c03af4dc65..da4abbc5f2a 100644 --- a/command/operator_scheduler_set_config.go +++ b/command/operator_scheduler_set_config.go @@ -9,7 +9,7 @@ import ( "github.com/hashicorp/cli" "github.com/hashicorp/nomad/api" - flagHelper "github.com/hashicorp/nomad/helper/flags" + flagHelper "github.com/hashicorp/nomad/v2/helper/flags" "github.com/posener/complete" ) diff --git a/command/operator_scheduler_set_config_test.go b/command/operator_scheduler_set_config_test.go index bca384ba5ab..41f3353b7cc 100644 --- a/command/operator_scheduler_set_config_test.go +++ b/command/operator_scheduler_set_config_test.go @@ -9,7 +9,7 @@ import ( "github.com/hashicorp/cli" "github.com/hashicorp/nomad/api" - "github.com/hashicorp/nomad/ci" + "github.com/hashicorp/nomad/v2/ci" "github.com/shoenig/test/must" ) diff --git a/command/operator_snapshot_inspect.go b/command/operator_snapshot_inspect.go index 65105d10a19..066812a111a 100644 --- a/command/operator_snapshot_inspect.go +++ b/command/operator_snapshot_inspect.go @@ -14,8 +14,8 @@ import ( humanize "github.com/dustin/go-humanize" "github.com/hashicorp/go-msgpack/v2/codec" - "github.com/hashicorp/nomad/helper/snapshot" - "github.com/hashicorp/nomad/nomad" + "github.com/hashicorp/nomad/v2/helper/snapshot" + "github.com/hashicorp/nomad/v2/nomad" "github.com/hashicorp/raft" "github.com/posener/complete" ) diff --git a/command/operator_snapshot_inspect_test.go b/command/operator_snapshot_inspect_test.go index 84d626d2776..75ad5145346 100644 --- a/command/operator_snapshot_inspect_test.go +++ b/command/operator_snapshot_inspect_test.go @@ -10,8 +10,8 @@ import ( "github.com/hashicorp/cli" "github.com/hashicorp/nomad/api" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/command/agent" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/command/agent" "github.com/shoenig/test/must" ) diff --git a/command/operator_snapshot_redact.go b/command/operator_snapshot_redact.go index 5c3166afca4..bc99cf93fd8 100644 --- a/command/operator_snapshot_redact.go +++ b/command/operator_snapshot_redact.go @@ -9,7 +9,7 @@ import ( "os" "strings" - "github.com/hashicorp/nomad/helper/raftutil" + "github.com/hashicorp/nomad/v2/helper/raftutil" "github.com/posener/complete" ) diff --git a/command/operator_snapshot_restore_test.go b/command/operator_snapshot_restore_test.go index 770c4079fd7..5e58d312548 100644 --- a/command/operator_snapshot_restore_test.go +++ b/command/operator_snapshot_restore_test.go @@ -10,9 +10,9 @@ import ( "github.com/hashicorp/cli" "github.com/hashicorp/nomad/api" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/command/agent" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/command/agent" + "github.com/hashicorp/nomad/v2/nomad/structs" "github.com/shoenig/test/must" ) diff --git a/command/operator_snapshot_save.go b/command/operator_snapshot_save.go index 205ebc80a9a..e2a59de0045 100644 --- a/command/operator_snapshot_save.go +++ b/command/operator_snapshot_save.go @@ -11,7 +11,7 @@ import ( "time" "github.com/hashicorp/nomad/api" - "github.com/hashicorp/nomad/helper/raftutil" + "github.com/hashicorp/nomad/v2/helper/raftutil" "github.com/posener/complete" ) diff --git a/command/operator_snapshot_save_test.go b/command/operator_snapshot_save_test.go index c9b7a3a880c..61fd3d378e3 100644 --- a/command/operator_snapshot_save_test.go +++ b/command/operator_snapshot_save_test.go @@ -9,9 +9,9 @@ import ( "testing" "github.com/hashicorp/cli" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/command/agent" - "github.com/hashicorp/nomad/helper/snapshot" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/command/agent" + "github.com/hashicorp/nomad/v2/helper/snapshot" "github.com/shoenig/test/must" ) diff --git a/command/operator_snapshot_state.go b/command/operator_snapshot_state.go index e0116b7c4c0..20384af6210 100644 --- a/command/operator_snapshot_state.go +++ b/command/operator_snapshot_state.go @@ -9,9 +9,9 @@ import ( "os" "strings" - flaghelper "github.com/hashicorp/nomad/helper/flags" - "github.com/hashicorp/nomad/helper/raftutil" - "github.com/hashicorp/nomad/nomad" + flaghelper "github.com/hashicorp/nomad/v2/helper/flags" + "github.com/hashicorp/nomad/v2/helper/raftutil" + "github.com/hashicorp/nomad/v2/nomad" "github.com/posener/complete" ) diff --git a/command/operator_test.go b/command/operator_test.go index 4dc15d17934..ea9d2193378 100644 --- a/command/operator_test.go +++ b/command/operator_test.go @@ -7,7 +7,7 @@ import ( "testing" "github.com/hashicorp/cli" - "github.com/hashicorp/nomad/ci" + "github.com/hashicorp/nomad/v2/ci" ) func TestOperator_Implements(t *testing.T) { diff --git a/command/plugin_status_test.go b/command/plugin_status_test.go index 612894c5876..931fe9c981b 100644 --- a/command/plugin_status_test.go +++ b/command/plugin_status_test.go @@ -8,8 +8,8 @@ import ( "github.com/hashicorp/cli" "github.com/hashicorp/go-memdb" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/nomad/state" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/nomad/state" "github.com/posener/complete" "github.com/shoenig/test/must" ) diff --git a/command/quota_apply.go b/command/quota_apply.go index 2e236a732bc..fe1cb7325e8 100644 --- a/command/quota_apply.go +++ b/command/quota_apply.go @@ -18,7 +18,7 @@ import ( "github.com/hashicorp/hcl" "github.com/hashicorp/hcl/hcl/ast" "github.com/hashicorp/nomad/api" - "github.com/hashicorp/nomad/helper" + "github.com/hashicorp/nomad/v2/helper" "github.com/posener/complete" ) diff --git a/command/quota_apply_test.go b/command/quota_apply_test.go index 1e385518e69..b65a9a77a8c 100644 --- a/command/quota_apply_test.go +++ b/command/quota_apply_test.go @@ -9,7 +9,7 @@ import ( "github.com/hashicorp/cli" "github.com/hashicorp/nomad/api" - "github.com/hashicorp/nomad/ci" + "github.com/hashicorp/nomad/v2/ci" "github.com/shoenig/test/must" ) diff --git a/command/quota_delete_test.go b/command/quota_delete_test.go index 50c57989db3..c24554aff69 100644 --- a/command/quota_delete_test.go +++ b/command/quota_delete_test.go @@ -12,9 +12,9 @@ import ( "github.com/hashicorp/cli" "github.com/hashicorp/nomad/api" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/helper/pointer" - "github.com/hashicorp/nomad/helper/uuid" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/helper/pointer" + "github.com/hashicorp/nomad/v2/helper/uuid" "github.com/posener/complete" "github.com/shoenig/test/must" ) diff --git a/command/quota_init_test.go b/command/quota_init_test.go index bc473624a7e..161aa3176ea 100644 --- a/command/quota_init_test.go +++ b/command/quota_init_test.go @@ -8,7 +8,7 @@ import ( "testing" "github.com/hashicorp/cli" - "github.com/hashicorp/nomad/ci" + "github.com/hashicorp/nomad/v2/ci" "github.com/shoenig/test/must" ) diff --git a/command/quota_inspect_test.go b/command/quota_inspect_test.go index f99acb78474..498f2db670a 100644 --- a/command/quota_inspect_test.go +++ b/command/quota_inspect_test.go @@ -12,7 +12,7 @@ import ( "github.com/hashicorp/cli" "github.com/hashicorp/nomad/api" - "github.com/hashicorp/nomad/ci" + "github.com/hashicorp/nomad/v2/ci" "github.com/posener/complete" "github.com/shoenig/test/must" ) diff --git a/command/quota_list_test.go b/command/quota_list_test.go index 0dad8958f37..a2602b33a53 100644 --- a/command/quota_list_test.go +++ b/command/quota_list_test.go @@ -11,7 +11,7 @@ import ( "testing" "github.com/hashicorp/cli" - "github.com/hashicorp/nomad/ci" + "github.com/hashicorp/nomad/v2/ci" "github.com/shoenig/test/must" ) diff --git a/command/quota_status_test.go b/command/quota_status_test.go index 2a10e275b4d..3e03efde273 100644 --- a/command/quota_status_test.go +++ b/command/quota_status_test.go @@ -12,7 +12,7 @@ import ( "github.com/hashicorp/cli" "github.com/hashicorp/nomad/api" - "github.com/hashicorp/nomad/ci" + "github.com/hashicorp/nomad/v2/ci" "github.com/posener/complete" "github.com/shoenig/test/must" ) diff --git a/command/recommendation_apply_test.go b/command/recommendation_apply_test.go index 094c7f0f33a..9c6769288e6 100644 --- a/command/recommendation_apply_test.go +++ b/command/recommendation_apply_test.go @@ -9,8 +9,8 @@ import ( "github.com/hashicorp/cli" "github.com/hashicorp/nomad/api" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/testutil" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/testutil" "github.com/shoenig/test/must" ) diff --git a/command/recommendation_dismiss_test.go b/command/recommendation_dismiss_test.go index a592f71e66f..b6841d6eebe 100644 --- a/command/recommendation_dismiss_test.go +++ b/command/recommendation_dismiss_test.go @@ -9,9 +9,9 @@ import ( "github.com/hashicorp/cli" "github.com/hashicorp/nomad/api" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/command/agent" - "github.com/hashicorp/nomad/testutil" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/command/agent" + "github.com/hashicorp/nomad/v2/testutil" "github.com/posener/complete" "github.com/shoenig/test/must" ) diff --git a/command/recommendation_info_test.go b/command/recommendation_info_test.go index cc205e82254..e31faf747f6 100644 --- a/command/recommendation_info_test.go +++ b/command/recommendation_info_test.go @@ -9,8 +9,8 @@ import ( "github.com/hashicorp/cli" "github.com/hashicorp/nomad/api" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/testutil" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/testutil" "github.com/shoenig/test/must" ) diff --git a/command/recommendation_list_test.go b/command/recommendation_list_test.go index 3d09c5939e8..27bf44d330c 100644 --- a/command/recommendation_list_test.go +++ b/command/recommendation_list_test.go @@ -9,8 +9,8 @@ import ( "github.com/hashicorp/cli" "github.com/hashicorp/nomad/api" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/testutil" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/testutil" "github.com/shoenig/test/must" ) diff --git a/command/scaling_policy_info_test.go b/command/scaling_policy_info_test.go index 69a17271c77..030127ecf50 100644 --- a/command/scaling_policy_info_test.go +++ b/command/scaling_policy_info_test.go @@ -10,8 +10,8 @@ import ( "github.com/hashicorp/cli" "github.com/hashicorp/nomad/api" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/testutil" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/testutil" ) func TestScalingPolicyInfoCommand_Run(t *testing.T) { diff --git a/command/scaling_policy_list_test.go b/command/scaling_policy_list_test.go index 2edcd3fcb14..48eb4ef9c04 100644 --- a/command/scaling_policy_list_test.go +++ b/command/scaling_policy_list_test.go @@ -8,7 +8,7 @@ import ( "github.com/hashicorp/cli" "github.com/hashicorp/nomad/api" - "github.com/hashicorp/nomad/ci" + "github.com/hashicorp/nomad/v2/ci" "github.com/shoenig/test/must" ) diff --git a/command/scaling_policy_test.go b/command/scaling_policy_test.go index c880f2a2390..545baa415a7 100644 --- a/command/scaling_policy_test.go +++ b/command/scaling_policy_test.go @@ -6,7 +6,7 @@ package command import ( "testing" - "github.com/hashicorp/nomad/ci" + "github.com/hashicorp/nomad/v2/ci" "github.com/shoenig/test/must" ) diff --git a/command/sentinel_apply_test.go b/command/sentinel_apply_test.go index 7a923730c58..64e096103a0 100644 --- a/command/sentinel_apply_test.go +++ b/command/sentinel_apply_test.go @@ -7,7 +7,7 @@ import ( "testing" "github.com/hashicorp/cli" - "github.com/hashicorp/nomad/ci" + "github.com/hashicorp/nomad/v2/ci" ) func TestSentinelApplyCommand_Implements(t *testing.T) { diff --git a/command/sentinel_delete_test.go b/command/sentinel_delete_test.go index 93f61d16a64..c43d134e390 100644 --- a/command/sentinel_delete_test.go +++ b/command/sentinel_delete_test.go @@ -7,7 +7,7 @@ import ( "testing" "github.com/hashicorp/cli" - "github.com/hashicorp/nomad/ci" + "github.com/hashicorp/nomad/v2/ci" ) func TestSentinelDeleteCommand_Implements(t *testing.T) { diff --git a/command/sentinel_list_test.go b/command/sentinel_list_test.go index bfa8a73d66a..0ba212a3918 100644 --- a/command/sentinel_list_test.go +++ b/command/sentinel_list_test.go @@ -7,7 +7,7 @@ import ( "testing" "github.com/hashicorp/cli" - "github.com/hashicorp/nomad/ci" + "github.com/hashicorp/nomad/v2/ci" ) func TestSentinelListCommand_Implements(t *testing.T) { diff --git a/command/sentinel_read_test.go b/command/sentinel_read_test.go index e5e2ab7bcc8..cfcce7f0ee3 100644 --- a/command/sentinel_read_test.go +++ b/command/sentinel_read_test.go @@ -7,7 +7,7 @@ import ( "testing" "github.com/hashicorp/cli" - "github.com/hashicorp/nomad/ci" + "github.com/hashicorp/nomad/v2/ci" ) func TestSentinelReadCommand_Implements(t *testing.T) { diff --git a/command/server_force_leave.go b/command/server_force_leave.go index dd4a4ccdedb..1923b1aad42 100644 --- a/command/server_force_leave.go +++ b/command/server_force_leave.go @@ -8,7 +8,7 @@ import ( "strings" "github.com/hashicorp/nomad/api" - "github.com/hashicorp/nomad/helper" + "github.com/hashicorp/nomad/v2/helper" "github.com/posener/complete" ) diff --git a/command/server_force_leave_test.go b/command/server_force_leave_test.go index 71cd1ac9045..8a32aaf097c 100644 --- a/command/server_force_leave_test.go +++ b/command/server_force_leave_test.go @@ -7,7 +7,7 @@ import ( "testing" "github.com/hashicorp/cli" - "github.com/hashicorp/nomad/ci" + "github.com/hashicorp/nomad/v2/ci" ) func TestServerForceLeaveCommand_Implements(t *testing.T) { diff --git a/command/server_join_test.go b/command/server_join_test.go index 49560080c6e..158dee33a93 100644 --- a/command/server_join_test.go +++ b/command/server_join_test.go @@ -7,7 +7,7 @@ import ( "testing" "github.com/hashicorp/cli" - "github.com/hashicorp/nomad/ci" + "github.com/hashicorp/nomad/v2/ci" ) func TestServerJoinCommand_Implements(t *testing.T) { diff --git a/command/server_members_test.go b/command/server_members_test.go index ec1a6eea5ea..ee8b77807c5 100644 --- a/command/server_members_test.go +++ b/command/server_members_test.go @@ -11,8 +11,8 @@ import ( "github.com/hashicorp/cli" "github.com/hashicorp/nomad/api" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/command/agent" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/command/agent" "github.com/shoenig/test/must" ) diff --git a/command/service_delete_test.go b/command/service_delete_test.go index 91d517ae6cc..6cdae2da68b 100644 --- a/command/service_delete_test.go +++ b/command/service_delete_test.go @@ -9,10 +9,10 @@ import ( "github.com/hashicorp/cli" "github.com/hashicorp/nomad/api" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/testutil" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/testutil" "github.com/shoenig/test/must" ) diff --git a/command/service_info_test.go b/command/service_info_test.go index b395876211a..0d550917228 100644 --- a/command/service_info_test.go +++ b/command/service_info_test.go @@ -11,8 +11,8 @@ import ( "github.com/hashicorp/cli" "github.com/hashicorp/nomad/api" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/testutil" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/testutil" "github.com/shoenig/test/must" "github.com/stretchr/testify/require" ) diff --git a/command/service_list_test.go b/command/service_list_test.go index b18e78f00b1..a61fe219320 100644 --- a/command/service_list_test.go +++ b/command/service_list_test.go @@ -10,8 +10,8 @@ import ( "github.com/hashicorp/cli" "github.com/hashicorp/nomad/api" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/testutil" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/testutil" "github.com/shoenig/test/must" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/command/setup_vault_test.go b/command/setup_vault_test.go index c872c06ae49..6a769a0e138 100644 --- a/command/setup_vault_test.go +++ b/command/setup_vault_test.go @@ -9,8 +9,8 @@ import ( "github.com/hashicorp/cli" "github.com/hashicorp/nomad/api" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/command/agent" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/command/agent" "github.com/shoenig/test/must" ) diff --git a/command/status_test.go b/command/status_test.go index 6a56f22967c..6181f32bbdb 100644 --- a/command/status_test.go +++ b/command/status_test.go @@ -9,11 +9,11 @@ import ( "testing" "github.com/hashicorp/cli" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/command/agent" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/testutil" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/command/agent" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/testutil" "github.com/posener/complete" "github.com/shoenig/test/must" ) diff --git a/command/system_gc_test.go b/command/system_gc_test.go index 6accf258d66..66c215ecff2 100644 --- a/command/system_gc_test.go +++ b/command/system_gc_test.go @@ -7,7 +7,7 @@ import ( "testing" "github.com/hashicorp/cli" - "github.com/hashicorp/nomad/ci" + "github.com/hashicorp/nomad/v2/ci" ) func TestSystemGCCommand_Implements(t *testing.T) { diff --git a/command/system_reconcile_summaries_test.go b/command/system_reconcile_summaries_test.go index 82ad6c25ebe..a8b3d0dc229 100644 --- a/command/system_reconcile_summaries_test.go +++ b/command/system_reconcile_summaries_test.go @@ -7,7 +7,7 @@ import ( "testing" "github.com/hashicorp/cli" - "github.com/hashicorp/nomad/ci" + "github.com/hashicorp/nomad/v2/ci" ) func TestSystemReconcileSummariesCommand_Implements(t *testing.T) { diff --git a/command/system_reconcile_test.go b/command/system_reconcile_test.go index 2f2b8cc5399..35a27fdc9dc 100644 --- a/command/system_reconcile_test.go +++ b/command/system_reconcile_test.go @@ -7,7 +7,7 @@ import ( "testing" "github.com/hashicorp/cli" - "github.com/hashicorp/nomad/ci" + "github.com/hashicorp/nomad/v2/ci" ) func TestSystemReconcileCommand_Implements(t *testing.T) { diff --git a/command/system_test.go b/command/system_test.go index e4241eb8877..39fa24aeb0c 100644 --- a/command/system_test.go +++ b/command/system_test.go @@ -7,7 +7,7 @@ import ( "testing" "github.com/hashicorp/cli" - "github.com/hashicorp/nomad/ci" + "github.com/hashicorp/nomad/v2/ci" ) func TestSystemCommand_Implements(t *testing.T) { diff --git a/command/testing_test.go b/command/testing_test.go index 86aa233de1e..1a3a2dc818b 100644 --- a/command/testing_test.go +++ b/command/testing_test.go @@ -11,9 +11,9 @@ import ( "time" "github.com/hashicorp/nomad/api" - "github.com/hashicorp/nomad/command/agent" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/testutil" + "github.com/hashicorp/nomad/v2/command/agent" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/testutil" "github.com/shoenig/test/must" ) diff --git a/command/tls_ca_create.go b/command/tls_ca_create.go index 2f0f9e9031b..986e6ad1bae 100644 --- a/command/tls_ca_create.go +++ b/command/tls_ca_create.go @@ -9,9 +9,9 @@ import ( "github.com/posener/complete" - "github.com/hashicorp/nomad/helper/flags" - "github.com/hashicorp/nomad/helper/tlsutil" - "github.com/hashicorp/nomad/lib/file" + "github.com/hashicorp/nomad/v2/helper/flags" + "github.com/hashicorp/nomad/v2/helper/tlsutil" + "github.com/hashicorp/nomad/v2/lib/file" ) type TLSCACreateCommand struct { diff --git a/command/tls_ca_create_test.go b/command/tls_ca_create_test.go index 9c612f0372a..4627e3c0dbf 100644 --- a/command/tls_ca_create_test.go +++ b/command/tls_ca_create_test.go @@ -10,7 +10,7 @@ import ( "time" "github.com/hashicorp/cli" - "github.com/hashicorp/nomad/testutil" + "github.com/hashicorp/nomad/v2/testutil" "github.com/shoenig/test/must" ) diff --git a/command/tls_ca_info.go b/command/tls_ca_info.go index 26ef1d2a193..faf7006f587 100644 --- a/command/tls_ca_info.go +++ b/command/tls_ca_info.go @@ -8,7 +8,7 @@ import ( "os" "strings" - "github.com/hashicorp/nomad/helper/tlsutil" + "github.com/hashicorp/nomad/v2/helper/tlsutil" "github.com/posener/complete" "github.com/ryanuber/columnize" ) diff --git a/command/tls_cert_create.go b/command/tls_cert_create.go index 8773df3b684..e9f2201f16b 100644 --- a/command/tls_cert_create.go +++ b/command/tls_cert_create.go @@ -12,9 +12,9 @@ import ( "github.com/posener/complete" - "github.com/hashicorp/nomad/helper/flags" - "github.com/hashicorp/nomad/helper/tlsutil" - "github.com/hashicorp/nomad/lib/file" + "github.com/hashicorp/nomad/v2/helper/flags" + "github.com/hashicorp/nomad/v2/helper/tlsutil" + "github.com/hashicorp/nomad/v2/lib/file" ) type TLSCertCreateCommand struct { diff --git a/command/tls_cert_create_test.go b/command/tls_cert_create_test.go index bf0d1fb8086..2470aa0a90b 100644 --- a/command/tls_cert_create_test.go +++ b/command/tls_cert_create_test.go @@ -11,8 +11,8 @@ import ( "testing" "github.com/hashicorp/cli" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/testutil" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/testutil" "github.com/shoenig/test/must" ) diff --git a/command/tls_cert_info.go b/command/tls_cert_info.go index f9a8899c6dc..071a89d57a0 100644 --- a/command/tls_cert_info.go +++ b/command/tls_cert_info.go @@ -11,7 +11,7 @@ import ( "github.com/posener/complete" "github.com/ryanuber/columnize" - "github.com/hashicorp/nomad/helper/tlsutil" + "github.com/hashicorp/nomad/v2/helper/tlsutil" ) type TLSCertInfoCommand struct { diff --git a/command/ui/writer_ui_test.go b/command/ui/writer_ui_test.go index 60c5d614e62..6fb54f59d3e 100644 --- a/command/ui/writer_ui_test.go +++ b/command/ui/writer_ui_test.go @@ -10,7 +10,7 @@ import ( "testing" "github.com/hashicorp/cli" - "github.com/hashicorp/nomad/ci" + "github.com/hashicorp/nomad/v2/ci" "github.com/shoenig/test/must" ) diff --git a/command/var_get_test.go b/command/var_get_test.go index 2d0855f01dc..d499e0d211b 100644 --- a/command/var_get_test.go +++ b/command/var_get_test.go @@ -10,7 +10,7 @@ import ( "github.com/hashicorp/cli" "github.com/hashicorp/nomad/api" - "github.com/hashicorp/nomad/ci" + "github.com/hashicorp/nomad/v2/ci" "github.com/posener/complete" "github.com/shoenig/test/must" ) diff --git a/command/var_init_test.go b/command/var_init_test.go index 9736708497f..322026b6ff7 100644 --- a/command/var_init_test.go +++ b/command/var_init_test.go @@ -9,7 +9,7 @@ import ( "testing" "github.com/hashicorp/cli" - "github.com/hashicorp/nomad/ci" + "github.com/hashicorp/nomad/v2/ci" "github.com/shoenig/test/must" ) diff --git a/command/var_list_test.go b/command/var_list_test.go index c8f7ba130bb..a3a67528d44 100644 --- a/command/var_list_test.go +++ b/command/var_list_test.go @@ -11,7 +11,7 @@ import ( "github.com/hashicorp/cli" "github.com/hashicorp/nomad/api" - "github.com/hashicorp/nomad/ci" + "github.com/hashicorp/nomad/v2/ci" "github.com/shoenig/test/must" ) diff --git a/command/var_lock_test.go b/command/var_lock_test.go index ef02cb1610b..91a9187c12c 100644 --- a/command/var_lock_test.go +++ b/command/var_lock_test.go @@ -10,7 +10,7 @@ import ( "time" "github.com/hashicorp/cli" - "github.com/hashicorp/nomad/ci" + "github.com/hashicorp/nomad/v2/ci" "github.com/shoenig/test/must" ) diff --git a/command/var_purge_test.go b/command/var_purge_test.go index 720dc01ed24..6e8236ce17d 100644 --- a/command/var_purge_test.go +++ b/command/var_purge_test.go @@ -9,7 +9,7 @@ import ( "testing" "github.com/hashicorp/cli" - "github.com/hashicorp/nomad/ci" + "github.com/hashicorp/nomad/v2/ci" "github.com/posener/complete" "github.com/shoenig/test/must" ) diff --git a/command/var_put.go b/command/var_put.go index 508b9f547dd..56d7feb0342 100644 --- a/command/var_put.go +++ b/command/var_put.go @@ -21,7 +21,7 @@ import ( "github.com/hashicorp/hcl" "github.com/hashicorp/hcl/hcl/ast" "github.com/hashicorp/nomad/api" - "github.com/hashicorp/nomad/helper" + "github.com/hashicorp/nomad/v2/helper" "github.com/posener/complete" "golang.org/x/text/cases" "golang.org/x/text/language" diff --git a/command/var_put_test.go b/command/var_put_test.go index 4633b21282a..cd6b09d7ec4 100644 --- a/command/var_put_test.go +++ b/command/var_put_test.go @@ -13,7 +13,7 @@ import ( "github.com/hashicorp/cli" "github.com/hashicorp/nomad/api" - "github.com/hashicorp/nomad/ci" + "github.com/hashicorp/nomad/v2/ci" "github.com/posener/complete" "github.com/shoenig/test/must" ) diff --git a/command/version.go b/command/version.go index c345120494a..ea235155486 100644 --- a/command/version.go +++ b/command/version.go @@ -5,7 +5,7 @@ package command import ( "github.com/hashicorp/cli" - "github.com/hashicorp/nomad/version" + "github.com/hashicorp/nomad/v2/version" ) // VersionCommand is a Command implementation prints the version. diff --git a/command/version_test.go b/command/version_test.go index 4126f634d12..5e26a3d1037 100644 --- a/command/version_test.go +++ b/command/version_test.go @@ -7,7 +7,7 @@ import ( "testing" "github.com/hashicorp/cli" - "github.com/hashicorp/nomad/ci" + "github.com/hashicorp/nomad/v2/ci" ) func TestVersionCommand_implements(t *testing.T) { diff --git a/command/volume_claim_delete_test.go b/command/volume_claim_delete_test.go index 6e80678f9df..32d73f060a6 100644 --- a/command/volume_claim_delete_test.go +++ b/command/volume_claim_delete_test.go @@ -7,11 +7,11 @@ import ( "testing" "github.com/hashicorp/cli" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/command/agent" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/command/agent" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" "github.com/shoenig/test/must" ) diff --git a/command/volume_claim_list_test.go b/command/volume_claim_list_test.go index 894f2a4af2b..81286013cc6 100644 --- a/command/volume_claim_list_test.go +++ b/command/volume_claim_list_test.go @@ -9,11 +9,11 @@ import ( "github.com/hashicorp/cli" "github.com/shoenig/test/must" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/command/agent" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/command/agent" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" ) func TestVolumeClaimListCommand_Run(t *testing.T) { diff --git a/command/volume_create_csi_test.go b/command/volume_create_csi_test.go index bbbefe0e4a5..f56fa0caf49 100644 --- a/command/volume_create_csi_test.go +++ b/command/volume_create_csi_test.go @@ -9,7 +9,7 @@ import ( "github.com/hashicorp/cli" "github.com/hashicorp/nomad/api" - "github.com/hashicorp/nomad/ci" + "github.com/hashicorp/nomad/v2/ci" "github.com/shoenig/test/must" ) diff --git a/command/volume_create_host.go b/command/volume_create_host.go index 8dd923c3649..22312e3e5ff 100644 --- a/command/volume_create_host.go +++ b/command/volume_create_host.go @@ -13,7 +13,7 @@ import ( "github.com/hashicorp/hcl" "github.com/hashicorp/hcl/hcl/ast" "github.com/hashicorp/nomad/api" - "github.com/hashicorp/nomad/helper" + "github.com/hashicorp/nomad/v2/helper" "github.com/mitchellh/go-glint" "github.com/mitchellh/go-glint/components" ) diff --git a/command/volume_create_host_test.go b/command/volume_create_host_test.go index cd7a217bb72..13145dc4beb 100644 --- a/command/volume_create_host_test.go +++ b/command/volume_create_host_test.go @@ -11,8 +11,8 @@ import ( "github.com/hashicorp/cli" "github.com/hashicorp/hcl" "github.com/hashicorp/nomad/api" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/command/agent" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/command/agent" "github.com/shoenig/test/must" ) diff --git a/command/volume_delete.go b/command/volume_delete.go index ed49a2ea1d2..bd62feadc31 100644 --- a/command/volume_delete.go +++ b/command/volume_delete.go @@ -9,8 +9,8 @@ import ( "github.com/hashicorp/nomad/api" "github.com/hashicorp/nomad/api/contexts" - "github.com/hashicorp/nomad/helper" - flaghelper "github.com/hashicorp/nomad/helper/flags" + "github.com/hashicorp/nomad/v2/helper" + flaghelper "github.com/hashicorp/nomad/v2/helper/flags" "github.com/posener/complete" ) diff --git a/command/volume_delete_host_test.go b/command/volume_delete_host_test.go index 9d549206aab..93d2c309b11 100644 --- a/command/volume_delete_host_test.go +++ b/command/volume_delete_host_test.go @@ -11,7 +11,7 @@ import ( "github.com/hashicorp/cli" "github.com/hashicorp/nomad/api" - "github.com/hashicorp/nomad/ci" + "github.com/hashicorp/nomad/v2/ci" "github.com/posener/complete" "github.com/shoenig/test/must" ) diff --git a/command/volume_init.go b/command/volume_init.go index ea7e4143af9..5f72f3188f0 100644 --- a/command/volume_init.go +++ b/command/volume_init.go @@ -8,7 +8,7 @@ import ( "os" "strings" - "github.com/hashicorp/nomad/command/asset" + "github.com/hashicorp/nomad/v2/command/asset" "github.com/posener/complete" ) diff --git a/command/volume_register_csi.go b/command/volume_register_csi.go index 649a024a9b6..bf287fbe940 100644 --- a/command/volume_register_csi.go +++ b/command/volume_register_csi.go @@ -12,7 +12,7 @@ import ( "github.com/hashicorp/hcl" "github.com/hashicorp/hcl/hcl/ast" "github.com/hashicorp/nomad/api" - "github.com/hashicorp/nomad/helper" + "github.com/hashicorp/nomad/v2/helper" ) func (c *VolumeRegisterCommand) csiRegister(client *api.Client, ast *ast.File, override bool) int { diff --git a/command/volume_register_csi_test.go b/command/volume_register_csi_test.go index b087897e992..9d1d5e3c133 100644 --- a/command/volume_register_csi_test.go +++ b/command/volume_register_csi_test.go @@ -10,7 +10,7 @@ import ( "github.com/hashicorp/cli" "github.com/hashicorp/hcl" "github.com/hashicorp/nomad/api" - "github.com/hashicorp/nomad/ci" + "github.com/hashicorp/nomad/v2/ci" "github.com/shoenig/test/must" ) diff --git a/command/volume_register_host_test.go b/command/volume_register_host_test.go index ef8c129d18f..157cd5d59b3 100644 --- a/command/volume_register_host_test.go +++ b/command/volume_register_host_test.go @@ -11,7 +11,7 @@ import ( "github.com/hashicorp/cli" "github.com/hashicorp/nomad/api" - "github.com/hashicorp/nomad/ci" + "github.com/hashicorp/nomad/v2/ci" "github.com/shoenig/test/must" ) diff --git a/command/volume_snapshot_create.go b/command/volume_snapshot_create.go index b401d895364..1fcd74ef4c9 100644 --- a/command/volume_snapshot_create.go +++ b/command/volume_snapshot_create.go @@ -9,7 +9,7 @@ import ( "github.com/hashicorp/nomad/api" "github.com/hashicorp/nomad/api/contexts" - flaghelper "github.com/hashicorp/nomad/helper/flags" + flaghelper "github.com/hashicorp/nomad/v2/helper/flags" "github.com/posener/complete" ) diff --git a/command/volume_snapshot_delete.go b/command/volume_snapshot_delete.go index d771373cf06..bf48c303038 100644 --- a/command/volume_snapshot_delete.go +++ b/command/volume_snapshot_delete.go @@ -9,7 +9,7 @@ import ( "github.com/hashicorp/nomad/api" "github.com/hashicorp/nomad/api/contexts" - flaghelper "github.com/hashicorp/nomad/helper/flags" + flaghelper "github.com/hashicorp/nomad/v2/helper/flags" "github.com/posener/complete" ) diff --git a/command/volume_snapshot_list.go b/command/volume_snapshot_list.go index 7c959741fd2..66f8b343c32 100644 --- a/command/volume_snapshot_list.go +++ b/command/volume_snapshot_list.go @@ -14,7 +14,7 @@ import ( "github.com/dustin/go-humanize" "github.com/hashicorp/nomad/api" "github.com/hashicorp/nomad/api/contexts" - flaghelper "github.com/hashicorp/nomad/helper/flags" + flaghelper "github.com/hashicorp/nomad/v2/helper/flags" "github.com/posener/complete" ) diff --git a/command/volume_status_csi_test.go b/command/volume_status_csi_test.go index 90e9dbe2621..e9626b58ffa 100644 --- a/command/volume_status_csi_test.go +++ b/command/volume_status_csi_test.go @@ -7,9 +7,9 @@ import ( "testing" "github.com/hashicorp/cli" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/nomad/structs" "github.com/posener/complete" "github.com/shoenig/test/must" ) diff --git a/command/volume_status_host_test.go b/command/volume_status_host_test.go index bb66933c6a7..24dfe4a328d 100644 --- a/command/volume_status_host_test.go +++ b/command/volume_status_host_test.go @@ -11,7 +11,7 @@ import ( "github.com/hashicorp/cli" "github.com/hashicorp/nomad/api" - "github.com/hashicorp/nomad/ci" + "github.com/hashicorp/nomad/v2/ci" "github.com/posener/complete" "github.com/shoenig/test/must" ) diff --git a/command/windows_service_install.go b/command/windows_service_install.go index f519d0e9577..0b6dd8973c6 100644 --- a/command/windows_service_install.go +++ b/command/windows_service_install.go @@ -10,7 +10,7 @@ import ( "path/filepath" "strings" - "github.com/hashicorp/nomad/helper/winsvc" + "github.com/hashicorp/nomad/v2/helper/winsvc" "github.com/posener/complete" ) diff --git a/command/windows_service_install_test.go b/command/windows_service_install_test.go index 16bc80014b5..b91acb80a4d 100644 --- a/command/windows_service_install_test.go +++ b/command/windows_service_install_test.go @@ -13,7 +13,7 @@ import ( "text/template" "github.com/hashicorp/cli" - "github.com/hashicorp/nomad/helper/winsvc" + "github.com/hashicorp/nomad/v2/helper/winsvc" "github.com/shoenig/test/must" ) diff --git a/command/windows_service_uninstall.go b/command/windows_service_uninstall.go index 80eda377285..b2c89f5b537 100644 --- a/command/windows_service_uninstall.go +++ b/command/windows_service_uninstall.go @@ -7,7 +7,7 @@ import ( "fmt" "strings" - "github.com/hashicorp/nomad/helper/winsvc" + "github.com/hashicorp/nomad/v2/helper/winsvc" "github.com/posener/complete" ) diff --git a/command/windows_service_uninstall_test.go b/command/windows_service_uninstall_test.go index cb5d8fd4359..f84ad7f1d39 100644 --- a/command/windows_service_uninstall_test.go +++ b/command/windows_service_uninstall_test.go @@ -8,7 +8,7 @@ import ( "testing" "github.com/hashicorp/cli" - "github.com/hashicorp/nomad/helper/winsvc" + "github.com/hashicorp/nomad/v2/helper/winsvc" "github.com/shoenig/test/must" ) diff --git a/drivers/docker/cmd/main.go b/drivers/docker/cmd/main.go index 87f968a01ed..eb7da86193d 100644 --- a/drivers/docker/cmd/main.go +++ b/drivers/docker/cmd/main.go @@ -14,10 +14,10 @@ import ( log "github.com/hashicorp/go-hclog" plugin "github.com/hashicorp/go-plugin" - "github.com/hashicorp/nomad/drivers/docker" - "github.com/hashicorp/nomad/drivers/docker/docklog" - "github.com/hashicorp/nomad/plugins" - "github.com/hashicorp/nomad/plugins/base" + "github.com/hashicorp/nomad/v2/drivers/docker" + "github.com/hashicorp/nomad/v2/drivers/docker/docklog" + "github.com/hashicorp/nomad/v2/plugins" + "github.com/hashicorp/nomad/v2/plugins/base" ) func main() { diff --git a/drivers/docker/config.go b/drivers/docker/config.go index 29b8a9cff65..c6b0bfb6bbf 100644 --- a/drivers/docker/config.go +++ b/drivers/docker/config.go @@ -13,13 +13,13 @@ import ( "time" "github.com/hashicorp/go-hclog" - "github.com/hashicorp/nomad/drivers/shared/capabilities" - "github.com/hashicorp/nomad/helper/pluginutils/hclutils" - "github.com/hashicorp/nomad/helper/pluginutils/loader" - "github.com/hashicorp/nomad/plugins/base" - "github.com/hashicorp/nomad/plugins/drivers" - "github.com/hashicorp/nomad/plugins/drivers/fsisolation" - "github.com/hashicorp/nomad/plugins/shared/hclspec" + "github.com/hashicorp/nomad/v2/drivers/shared/capabilities" + "github.com/hashicorp/nomad/v2/helper/pluginutils/hclutils" + "github.com/hashicorp/nomad/v2/helper/pluginutils/loader" + "github.com/hashicorp/nomad/v2/plugins/base" + "github.com/hashicorp/nomad/v2/plugins/drivers" + "github.com/hashicorp/nomad/v2/plugins/drivers/fsisolation" + "github.com/hashicorp/nomad/v2/plugins/shared/hclspec" containerapi "github.com/moby/moby/api/types/container" "github.com/moby/moby/api/types/mount" ) diff --git a/drivers/docker/config_test.go b/drivers/docker/config_test.go index 9981cf34b49..b38ca1435ee 100644 --- a/drivers/docker/config_test.go +++ b/drivers/docker/config_test.go @@ -7,9 +7,9 @@ import ( "os" "testing" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/helper/pluginutils/hclutils" - "github.com/hashicorp/nomad/plugins/drivers" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/helper/pluginutils/hclutils" + "github.com/hashicorp/nomad/v2/plugins/drivers" "github.com/shoenig/test/must" "github.com/stretchr/testify/require" ) diff --git a/drivers/docker/coordinator.go b/drivers/docker/coordinator.go index eee8863ea1e..b86431391bb 100644 --- a/drivers/docker/coordinator.go +++ b/drivers/docker/coordinator.go @@ -14,7 +14,7 @@ import ( "github.com/containerd/errdefs" hclog "github.com/hashicorp/go-hclog" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/nomad/structs" "github.com/moby/moby/api/types/registry" mclient "github.com/moby/moby/client" ) diff --git a/drivers/docker/coordinator_test.go b/drivers/docker/coordinator_test.go index 4d732555201..91f68ceb270 100644 --- a/drivers/docker/coordinator_test.go +++ b/drivers/docker/coordinator_test.go @@ -12,10 +12,10 @@ import ( "testing" "time" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/helper/testlog" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/testutil" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/helper/testlog" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/testutil" "github.com/moby/moby/api/types/image" "github.com/moby/moby/api/types/jsonstream" mclient "github.com/moby/moby/client" diff --git a/drivers/docker/cpuset.go b/drivers/docker/cpuset.go index 6aae09e440f..8e66c1d5c08 100644 --- a/drivers/docker/cpuset.go +++ b/drivers/docker/cpuset.go @@ -8,8 +8,8 @@ import ( "path/filepath" "time" - "github.com/hashicorp/nomad/client/lib/cgroupslib" - "github.com/hashicorp/nomad/helper" + "github.com/hashicorp/nomad/v2/client/lib/cgroupslib" + "github.com/hashicorp/nomad/v2/helper" ) const ( diff --git a/drivers/docker/cpuset_test.go b/drivers/docker/cpuset_test.go index 752637a22a5..0b8731f9201 100644 --- a/drivers/docker/cpuset_test.go +++ b/drivers/docker/cpuset_test.go @@ -9,8 +9,8 @@ import ( "testing" "time" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/client/testutil" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/client/testutil" "github.com/shoenig/test/must" ) diff --git a/drivers/docker/docklog/client.go b/drivers/docker/docklog/client.go index 1a64519643b..f0c32ec73c4 100644 --- a/drivers/docker/docklog/client.go +++ b/drivers/docker/docklog/client.go @@ -6,7 +6,7 @@ package docklog import ( "context" - "github.com/hashicorp/nomad/drivers/docker/docklog/proto" + "github.com/hashicorp/nomad/v2/drivers/docker/docklog/proto" ) // dockerLoggerClient implements the dockerLogger interface for client side requests diff --git a/drivers/docker/docklog/docker_logger.go b/drivers/docker/docklog/docker_logger.go index 047482d5c97..16e7d339691 100644 --- a/drivers/docker/docklog/docker_logger.go +++ b/drivers/docker/docklog/docker_logger.go @@ -19,7 +19,7 @@ import ( "github.com/moby/moby/client" mclient "github.com/moby/moby/client" - "github.com/hashicorp/nomad/client/lib/fifo" + "github.com/hashicorp/nomad/v2/client/lib/fifo" ) // DockerLogger is a small utility to forward logs from a docker container to a target diff --git a/drivers/docker/docklog/docker_logger_test.go b/drivers/docker/docklog/docker_logger_test.go index 4dbf1346569..fbb35eba01e 100644 --- a/drivers/docker/docklog/docker_logger_test.go +++ b/drivers/docker/docklog/docker_logger_test.go @@ -19,10 +19,10 @@ import ( "github.com/shoenig/test/must" "github.com/stretchr/testify/require" - "github.com/hashicorp/nomad/ci" - ctu "github.com/hashicorp/nomad/client/testutil" - "github.com/hashicorp/nomad/helper/testlog" - "github.com/hashicorp/nomad/testutil" + "github.com/hashicorp/nomad/v2/ci" + ctu "github.com/hashicorp/nomad/v2/client/testutil" + "github.com/hashicorp/nomad/v2/helper/testlog" + "github.com/hashicorp/nomad/v2/testutil" ) func testRemoteContainerImage() string { diff --git a/drivers/docker/docklog/plugin.go b/drivers/docker/docklog/plugin.go index 1aeaf971c4d..1dbfba293fe 100644 --- a/drivers/docker/docklog/plugin.go +++ b/drivers/docker/docklog/plugin.go @@ -10,8 +10,8 @@ import ( hclog "github.com/hashicorp/go-hclog" plugin "github.com/hashicorp/go-plugin" - "github.com/hashicorp/nomad/drivers/docker/docklog/proto" - "github.com/hashicorp/nomad/plugins/base" + "github.com/hashicorp/nomad/v2/drivers/docker/docklog/proto" + "github.com/hashicorp/nomad/v2/plugins/base" "google.golang.org/grpc" ) diff --git a/drivers/docker/docklog/server.go b/drivers/docker/docklog/server.go index 4f92b537846..4ece408fdbb 100644 --- a/drivers/docker/docklog/server.go +++ b/drivers/docker/docklog/server.go @@ -8,7 +8,7 @@ import ( "github.com/hashicorp/go-plugin" - "github.com/hashicorp/nomad/drivers/docker/docklog/proto" + "github.com/hashicorp/nomad/v2/drivers/docker/docklog/proto" ) // dockerLoggerServer is the server side translation between the protobuf and native interfaces diff --git a/drivers/docker/docklog/z_docker_logger_cmd.go b/drivers/docker/docklog/z_docker_logger_cmd.go index ab3a1914b4c..4247e2e143e 100644 --- a/drivers/docker/docklog/z_docker_logger_cmd.go +++ b/drivers/docker/docklog/z_docker_logger_cmd.go @@ -8,7 +8,7 @@ import ( log "github.com/hashicorp/go-hclog" plugin "github.com/hashicorp/go-plugin" - "github.com/hashicorp/nomad/plugins/base" + "github.com/hashicorp/nomad/v2/plugins/base" ) // Install a plugin cli handler to ease working with tests diff --git a/drivers/docker/driver.go b/drivers/docker/driver.go index 064426cb6e8..29056d79c78 100644 --- a/drivers/docker/driver.go +++ b/drivers/docker/driver.go @@ -27,19 +27,19 @@ import ( multierror "github.com/hashicorp/go-multierror" plugin "github.com/hashicorp/go-plugin" "github.com/hashicorp/go-set/v3" - "github.com/hashicorp/nomad/client/lib/cgroupslib" - "github.com/hashicorp/nomad/client/lib/cpustats" - "github.com/hashicorp/nomad/client/taskenv" - "github.com/hashicorp/nomad/drivers/docker/docklog" - "github.com/hashicorp/nomad/drivers/shared/capabilities" - "github.com/hashicorp/nomad/drivers/shared/eventer" - "github.com/hashicorp/nomad/drivers/shared/hostnames" - "github.com/hashicorp/nomad/drivers/shared/resolvconf" - "github.com/hashicorp/nomad/helper" - nstructs "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/plugins/base" - "github.com/hashicorp/nomad/plugins/drivers" - pstructs "github.com/hashicorp/nomad/plugins/shared/structs" + "github.com/hashicorp/nomad/v2/client/lib/cgroupslib" + "github.com/hashicorp/nomad/v2/client/lib/cpustats" + "github.com/hashicorp/nomad/v2/client/taskenv" + "github.com/hashicorp/nomad/v2/drivers/docker/docklog" + "github.com/hashicorp/nomad/v2/drivers/shared/capabilities" + "github.com/hashicorp/nomad/v2/drivers/shared/eventer" + "github.com/hashicorp/nomad/v2/drivers/shared/hostnames" + "github.com/hashicorp/nomad/v2/drivers/shared/resolvconf" + "github.com/hashicorp/nomad/v2/helper" + nstructs "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/plugins/base" + "github.com/hashicorp/nomad/v2/plugins/drivers" + pstructs "github.com/hashicorp/nomad/v2/plugins/shared/structs" "github.com/moby/moby/api/pkg/stdcopy" containerapi "github.com/moby/moby/api/types/container" "github.com/moby/moby/api/types/mount" diff --git a/drivers/docker/driver_linux_test.go b/drivers/docker/driver_linux_test.go index 6e3c5a6a348..fdab78df9ac 100644 --- a/drivers/docker/driver_linux_test.go +++ b/drivers/docker/driver_linux_test.go @@ -14,8 +14,8 @@ import ( "testing" "time" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/client/testutil" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/client/testutil" "github.com/shoenig/test/must" "github.com/shoenig/test/wait" ) diff --git a/drivers/docker/driver_test.go b/drivers/docker/driver_test.go index 2628ac899dd..9d77a3ccb79 100644 --- a/drivers/docker/driver_test.go +++ b/drivers/docker/driver_test.go @@ -21,20 +21,20 @@ import ( "github.com/docker/go-connections/nat" hclog "github.com/hashicorp/go-hclog" "github.com/hashicorp/go-set/v3" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/client/lib/numalib" - "github.com/hashicorp/nomad/client/taskenv" - "github.com/hashicorp/nomad/client/testutil" - "github.com/hashicorp/nomad/helper/pluginutils/hclspecutils" - "github.com/hashicorp/nomad/helper/pluginutils/hclutils" - "github.com/hashicorp/nomad/helper/pluginutils/loader" - "github.com/hashicorp/nomad/helper/testlog" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/plugins/base" - "github.com/hashicorp/nomad/plugins/drivers" - dtestutil "github.com/hashicorp/nomad/plugins/drivers/testutils" - tu "github.com/hashicorp/nomad/testutil" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/client/lib/numalib" + "github.com/hashicorp/nomad/v2/client/taskenv" + "github.com/hashicorp/nomad/v2/client/testutil" + "github.com/hashicorp/nomad/v2/helper/pluginutils/hclspecutils" + "github.com/hashicorp/nomad/v2/helper/pluginutils/hclutils" + "github.com/hashicorp/nomad/v2/helper/pluginutils/loader" + "github.com/hashicorp/nomad/v2/helper/testlog" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/plugins/base" + "github.com/hashicorp/nomad/v2/plugins/drivers" + dtestutil "github.com/hashicorp/nomad/v2/plugins/drivers/testutils" + tu "github.com/hashicorp/nomad/v2/testutil" "github.com/moby/moby/api/types/container" containerapi "github.com/moby/moby/api/types/container" "github.com/moby/moby/api/types/mount" diff --git a/drivers/docker/driver_unix_test.go b/drivers/docker/driver_unix_test.go index 2f7bb07cf3a..a320eaa7bce 100644 --- a/drivers/docker/driver_unix_test.go +++ b/drivers/docker/driver_unix_test.go @@ -18,13 +18,13 @@ import ( "testing" "time" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/client/allocdir" - "github.com/hashicorp/nomad/client/testutil" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/plugins/drivers" - dtestutil "github.com/hashicorp/nomad/plugins/drivers/testutils" - ntestutil "github.com/hashicorp/nomad/testutil" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/client/allocdir" + "github.com/hashicorp/nomad/v2/client/testutil" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/plugins/drivers" + dtestutil "github.com/hashicorp/nomad/v2/plugins/drivers/testutils" + ntestutil "github.com/hashicorp/nomad/v2/testutil" "github.com/moby/moby/api/types/container" "github.com/moby/moby/api/types/mount" mclient "github.com/moby/moby/client" diff --git a/drivers/docker/driver_windows_test.go b/drivers/docker/driver_windows_test.go index e582ced94f3..19784509ade 100644 --- a/drivers/docker/driver_windows_test.go +++ b/drivers/docker/driver_windows_test.go @@ -9,10 +9,10 @@ import ( "os" "testing" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/client/allocdir" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/plugins/drivers" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/client/allocdir" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/plugins/drivers" "github.com/shoenig/test/must" ) diff --git a/drivers/docker/fingerprint.go b/drivers/docker/fingerprint.go index 4a6de61df9d..41b43079717 100644 --- a/drivers/docker/fingerprint.go +++ b/drivers/docker/fingerprint.go @@ -10,9 +10,9 @@ import ( "strings" "time" - "github.com/hashicorp/nomad/plugins/drivers" - "github.com/hashicorp/nomad/plugins/drivers/utils" - pstructs "github.com/hashicorp/nomad/plugins/shared/structs" + "github.com/hashicorp/nomad/v2/plugins/drivers" + "github.com/hashicorp/nomad/v2/plugins/drivers/utils" + pstructs "github.com/hashicorp/nomad/v2/plugins/shared/structs" mclient "github.com/moby/moby/client" ) diff --git a/drivers/docker/fingerprint_test.go b/drivers/docker/fingerprint_test.go index 87cd152dcb6..119114dcbd3 100644 --- a/drivers/docker/fingerprint_test.go +++ b/drivers/docker/fingerprint_test.go @@ -7,11 +7,11 @@ import ( "context" "testing" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/client/lib/numalib" - "github.com/hashicorp/nomad/client/testutil" - "github.com/hashicorp/nomad/helper/testlog" - "github.com/hashicorp/nomad/plugins/drivers" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/client/lib/numalib" + "github.com/hashicorp/nomad/v2/client/testutil" + "github.com/hashicorp/nomad/v2/helper/testlog" + "github.com/hashicorp/nomad/v2/plugins/drivers" "github.com/shoenig/test/must" ) diff --git a/drivers/docker/handle.go b/drivers/docker/handle.go index 0c221b1f659..fe0b53cc3ce 100644 --- a/drivers/docker/handle.go +++ b/drivers/docker/handle.go @@ -16,10 +16,10 @@ import ( "github.com/hashicorp/consul-template/signals" "github.com/hashicorp/go-hclog" "github.com/hashicorp/go-plugin" - "github.com/hashicorp/nomad/client/lib/cgroupslib" - "github.com/hashicorp/nomad/drivers/docker/docklog" - "github.com/hashicorp/nomad/plugins/drivers" - pstructs "github.com/hashicorp/nomad/plugins/shared/structs" + "github.com/hashicorp/nomad/v2/client/lib/cgroupslib" + "github.com/hashicorp/nomad/v2/drivers/docker/docklog" + "github.com/hashicorp/nomad/v2/plugins/drivers" + pstructs "github.com/hashicorp/nomad/v2/plugins/shared/structs" "github.com/moby/moby/api/pkg/stdcopy" containerapi "github.com/moby/moby/api/types/container" mclient "github.com/moby/moby/client" diff --git a/drivers/docker/handle_test.go b/drivers/docker/handle_test.go index d25245ae7ca..a2551b1b847 100644 --- a/drivers/docker/handle_test.go +++ b/drivers/docker/handle_test.go @@ -6,8 +6,8 @@ package docker import ( "testing" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/client/testutil" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/client/testutil" "github.com/shoenig/test/must" ) diff --git a/drivers/docker/network.go b/drivers/docker/network.go index a2f86c2f5a1..dcb017c0941 100644 --- a/drivers/docker/network.go +++ b/drivers/docker/network.go @@ -6,7 +6,7 @@ package docker import ( "fmt" - "github.com/hashicorp/nomad/plugins/drivers" + "github.com/hashicorp/nomad/v2/plugins/drivers" "github.com/moby/moby/api/types/container" containerapi "github.com/moby/moby/api/types/container" mclient "github.com/moby/moby/client" diff --git a/drivers/docker/network_test.go b/drivers/docker/network_test.go index 2ac5568481c..5b80d06a3d2 100644 --- a/drivers/docker/network_test.go +++ b/drivers/docker/network_test.go @@ -6,8 +6,8 @@ package docker import ( "testing" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/plugins/drivers" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/plugins/drivers" containerapi "github.com/moby/moby/api/types/container" "github.com/shoenig/test/must" ) diff --git a/drivers/docker/ports.go b/drivers/docker/ports.go index bca12afd8ba..936042bb4a3 100644 --- a/drivers/docker/ports.go +++ b/drivers/docker/ports.go @@ -8,7 +8,7 @@ import ( "github.com/docker/go-connections/nat" "github.com/hashicorp/go-hclog" - "github.com/hashicorp/nomad/helper/pluginutils/hclutils" + "github.com/hashicorp/nomad/v2/helper/pluginutils/hclutils" ) // publishedPorts is a utility struct to keep track of the port bindings to publish. diff --git a/drivers/docker/ports_test.go b/drivers/docker/ports_test.go index 9078e8e2b4d..5e485d26da5 100644 --- a/drivers/docker/ports_test.go +++ b/drivers/docker/ports_test.go @@ -6,8 +6,8 @@ package docker import ( "testing" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/helper/testlog" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/helper/testlog" "github.com/stretchr/testify/require" ) diff --git a/drivers/docker/progress_test.go b/drivers/docker/progress_test.go index 0e350b658e4..8bc36334915 100644 --- a/drivers/docker/progress_test.go +++ b/drivers/docker/progress_test.go @@ -7,7 +7,7 @@ import ( "testing" "time" - "github.com/hashicorp/nomad/ci" + "github.com/hashicorp/nomad/v2/ci" "github.com/shoenig/test/must" ) diff --git a/drivers/docker/reconcile_dangling_test.go b/drivers/docker/reconcile_dangling_test.go index 7e07bb44ee6..49be073607a 100644 --- a/drivers/docker/reconcile_dangling_test.go +++ b/drivers/docker/reconcile_dangling_test.go @@ -18,10 +18,10 @@ import ( "github.com/shoenig/test/must" "github.com/shoenig/test/wait" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/client/testutil" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/plugins/drivers" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/client/testutil" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/plugins/drivers" ) func fakeContainerList(t *testing.T) (nomadContainer, nonNomadContainer container.Summary) { diff --git a/drivers/docker/stats.go b/drivers/docker/stats.go index bc1b26fe128..29caf8fa512 100644 --- a/drivers/docker/stats.go +++ b/drivers/docker/stats.go @@ -12,11 +12,11 @@ import ( "sync" "time" - "github.com/hashicorp/nomad/client/lib/cpustats" - cstructs "github.com/hashicorp/nomad/client/structs" - "github.com/hashicorp/nomad/drivers/docker/util" - "github.com/hashicorp/nomad/helper" - nstructs "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/client/lib/cpustats" + cstructs "github.com/hashicorp/nomad/v2/client/structs" + "github.com/hashicorp/nomad/v2/drivers/docker/util" + "github.com/hashicorp/nomad/v2/helper" + nstructs "github.com/hashicorp/nomad/v2/nomad/structs" containerapi "github.com/moby/moby/api/types/container" mclient "github.com/moby/moby/client" ) diff --git a/drivers/docker/stats_test.go b/drivers/docker/stats_test.go index 3289354cd23..e21fc837c5b 100644 --- a/drivers/docker/stats_test.go +++ b/drivers/docker/stats_test.go @@ -10,11 +10,11 @@ import ( "testing" "time" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/client/lib/cpustats" - cstructs "github.com/hashicorp/nomad/client/structs" - "github.com/hashicorp/nomad/client/testutil" - "github.com/hashicorp/nomad/drivers/docker/util" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/client/lib/cpustats" + cstructs "github.com/hashicorp/nomad/v2/client/structs" + "github.com/hashicorp/nomad/v2/client/testutil" + "github.com/hashicorp/nomad/v2/drivers/docker/util" containerapi "github.com/moby/moby/api/types/container" "github.com/shoenig/test/must" ) diff --git a/drivers/docker/util/stats_posix.go b/drivers/docker/util/stats_posix.go index 847a083550c..86bb1cb7b9c 100644 --- a/drivers/docker/util/stats_posix.go +++ b/drivers/docker/util/stats_posix.go @@ -6,8 +6,8 @@ package util import ( - "github.com/hashicorp/nomad/client/lib/cpustats" - cstructs "github.com/hashicorp/nomad/client/structs" + "github.com/hashicorp/nomad/v2/client/lib/cpustats" + cstructs "github.com/hashicorp/nomad/v2/client/structs" containerapi "github.com/moby/moby/api/types/container" ) diff --git a/drivers/docker/util/stats_windows.go b/drivers/docker/util/stats_windows.go index d28088f20eb..a0756fc27d6 100644 --- a/drivers/docker/util/stats_windows.go +++ b/drivers/docker/util/stats_windows.go @@ -6,8 +6,8 @@ package util import ( - "github.com/hashicorp/nomad/client/lib/cpustats" - cstructs "github.com/hashicorp/nomad/client/structs" + "github.com/hashicorp/nomad/v2/client/lib/cpustats" + cstructs "github.com/hashicorp/nomad/v2/client/structs" containerapi "github.com/moby/moby/api/types/container" ) diff --git a/drivers/docker/utils_test.go b/drivers/docker/utils_test.go index 0b6736c7c01..2891023ec05 100644 --- a/drivers/docker/utils_test.go +++ b/drivers/docker/utils_test.go @@ -6,7 +6,7 @@ package docker import ( "testing" - "github.com/hashicorp/nomad/ci" + "github.com/hashicorp/nomad/v2/ci" "github.com/shoenig/test/must" "github.com/stretchr/testify/require" ) diff --git a/drivers/docker/utils_unix_test.go b/drivers/docker/utils_unix_test.go index 5a662f277c1..8baa2953afc 100644 --- a/drivers/docker/utils_unix_test.go +++ b/drivers/docker/utils_unix_test.go @@ -9,7 +9,7 @@ import ( "path/filepath" "testing" - "github.com/hashicorp/nomad/ci" + "github.com/hashicorp/nomad/v2/ci" "github.com/stretchr/testify/require" ) diff --git a/drivers/exec/driver.go b/drivers/exec/driver.go index b93d2ebd3b4..8726ff9c3f5 100644 --- a/drivers/exec/driver.go +++ b/drivers/exec/driver.go @@ -14,20 +14,20 @@ import ( "github.com/hashicorp/consul-template/signals" hclog "github.com/hashicorp/go-hclog" - "github.com/hashicorp/nomad/client/lib/cgroupslib" - "github.com/hashicorp/nomad/client/lib/cpustats" - "github.com/hashicorp/nomad/drivers/shared/capabilities" - "github.com/hashicorp/nomad/drivers/shared/eventer" - "github.com/hashicorp/nomad/drivers/shared/executor" - "github.com/hashicorp/nomad/drivers/shared/resolvconf" - "github.com/hashicorp/nomad/drivers/shared/validators" - "github.com/hashicorp/nomad/helper/pluginutils/loader" - "github.com/hashicorp/nomad/plugins/base" - "github.com/hashicorp/nomad/plugins/drivers" - "github.com/hashicorp/nomad/plugins/drivers/fsisolation" - "github.com/hashicorp/nomad/plugins/drivers/utils" - "github.com/hashicorp/nomad/plugins/shared/hclspec" - pstructs "github.com/hashicorp/nomad/plugins/shared/structs" + "github.com/hashicorp/nomad/v2/client/lib/cgroupslib" + "github.com/hashicorp/nomad/v2/client/lib/cpustats" + "github.com/hashicorp/nomad/v2/drivers/shared/capabilities" + "github.com/hashicorp/nomad/v2/drivers/shared/eventer" + "github.com/hashicorp/nomad/v2/drivers/shared/executor" + "github.com/hashicorp/nomad/v2/drivers/shared/resolvconf" + "github.com/hashicorp/nomad/v2/drivers/shared/validators" + "github.com/hashicorp/nomad/v2/helper/pluginutils/loader" + "github.com/hashicorp/nomad/v2/plugins/base" + "github.com/hashicorp/nomad/v2/plugins/drivers" + "github.com/hashicorp/nomad/v2/plugins/drivers/fsisolation" + "github.com/hashicorp/nomad/v2/plugins/drivers/utils" + "github.com/hashicorp/nomad/v2/plugins/shared/hclspec" + pstructs "github.com/hashicorp/nomad/v2/plugins/shared/structs" ) const ( diff --git a/drivers/exec/driver_test.go b/drivers/exec/driver_test.go index e5f8f1dcb24..7494a8cd2ac 100644 --- a/drivers/exec/driver_test.go +++ b/drivers/exec/driver_test.go @@ -18,21 +18,21 @@ import ( "testing" "time" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/client/allocdir" - "github.com/hashicorp/nomad/client/lib/cgroupslib" - "github.com/hashicorp/nomad/client/lib/numalib" - ctestutils "github.com/hashicorp/nomad/client/testutil" - "github.com/hashicorp/nomad/drivers/shared/executor" - "github.com/hashicorp/nomad/helper/pluginutils/hclutils" - "github.com/hashicorp/nomad/helper/testlog" - "github.com/hashicorp/nomad/helper/testtask" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/plugins/base" - "github.com/hashicorp/nomad/plugins/drivers" - dtestutil "github.com/hashicorp/nomad/plugins/drivers/testutils" - "github.com/hashicorp/nomad/testutil" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/client/allocdir" + "github.com/hashicorp/nomad/v2/client/lib/cgroupslib" + "github.com/hashicorp/nomad/v2/client/lib/numalib" + ctestutils "github.com/hashicorp/nomad/v2/client/testutil" + "github.com/hashicorp/nomad/v2/drivers/shared/executor" + "github.com/hashicorp/nomad/v2/helper/pluginutils/hclutils" + "github.com/hashicorp/nomad/v2/helper/testlog" + "github.com/hashicorp/nomad/v2/helper/testtask" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/plugins/base" + "github.com/hashicorp/nomad/v2/plugins/drivers" + dtestutil "github.com/hashicorp/nomad/v2/plugins/drivers/testutils" + "github.com/hashicorp/nomad/v2/testutil" "github.com/shoenig/test/must" "github.com/stretchr/testify/require" "golang.org/x/sys/unix" diff --git a/drivers/exec/driver_unix_test.go b/drivers/exec/driver_unix_test.go index 06d481b523a..ebda757cb4d 100644 --- a/drivers/exec/driver_unix_test.go +++ b/drivers/exec/driver_unix_test.go @@ -12,15 +12,15 @@ import ( "testing" "time" - "github.com/hashicorp/nomad/ci" - ctestutils "github.com/hashicorp/nomad/client/testutil" - "github.com/hashicorp/nomad/drivers/shared/capabilities" - "github.com/hashicorp/nomad/drivers/shared/executor" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/plugins/base" - "github.com/hashicorp/nomad/plugins/drivers" - dtestutil "github.com/hashicorp/nomad/plugins/drivers/testutils" - "github.com/hashicorp/nomad/testutil" + "github.com/hashicorp/nomad/v2/ci" + ctestutils "github.com/hashicorp/nomad/v2/client/testutil" + "github.com/hashicorp/nomad/v2/drivers/shared/capabilities" + "github.com/hashicorp/nomad/v2/drivers/shared/executor" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/plugins/base" + "github.com/hashicorp/nomad/v2/plugins/drivers" + dtestutil "github.com/hashicorp/nomad/v2/plugins/drivers/testutils" + "github.com/hashicorp/nomad/v2/testutil" "github.com/stretchr/testify/require" "golang.org/x/sys/unix" ) diff --git a/drivers/exec/handle.go b/drivers/exec/handle.go index e386fc1b0bd..6ef42c075a1 100644 --- a/drivers/exec/handle.go +++ b/drivers/exec/handle.go @@ -11,8 +11,8 @@ import ( hclog "github.com/hashicorp/go-hclog" plugin "github.com/hashicorp/go-plugin" - "github.com/hashicorp/nomad/drivers/shared/executor" - "github.com/hashicorp/nomad/plugins/drivers" + "github.com/hashicorp/nomad/v2/drivers/shared/executor" + "github.com/hashicorp/nomad/v2/plugins/drivers" ) type taskHandle struct { diff --git a/drivers/java/driver.go b/drivers/java/driver.go index 6b3fb56dd34..ace232c07e9 100644 --- a/drivers/java/driver.go +++ b/drivers/java/driver.go @@ -14,18 +14,18 @@ import ( "github.com/hashicorp/consul-template/signals" hclog "github.com/hashicorp/go-hclog" - "github.com/hashicorp/nomad/client/lib/cgroupslib" - "github.com/hashicorp/nomad/drivers/shared/capabilities" - "github.com/hashicorp/nomad/drivers/shared/eventer" - "github.com/hashicorp/nomad/drivers/shared/executor" - "github.com/hashicorp/nomad/drivers/shared/resolvconf" - "github.com/hashicorp/nomad/helper/pluginutils/loader" - "github.com/hashicorp/nomad/plugins/base" - "github.com/hashicorp/nomad/plugins/drivers" - "github.com/hashicorp/nomad/plugins/drivers/fsisolation" - "github.com/hashicorp/nomad/plugins/drivers/utils" - "github.com/hashicorp/nomad/plugins/shared/hclspec" - pstructs "github.com/hashicorp/nomad/plugins/shared/structs" + "github.com/hashicorp/nomad/v2/client/lib/cgroupslib" + "github.com/hashicorp/nomad/v2/drivers/shared/capabilities" + "github.com/hashicorp/nomad/v2/drivers/shared/eventer" + "github.com/hashicorp/nomad/v2/drivers/shared/executor" + "github.com/hashicorp/nomad/v2/drivers/shared/resolvconf" + "github.com/hashicorp/nomad/v2/helper/pluginutils/loader" + "github.com/hashicorp/nomad/v2/plugins/base" + "github.com/hashicorp/nomad/v2/plugins/drivers" + "github.com/hashicorp/nomad/v2/plugins/drivers/fsisolation" + "github.com/hashicorp/nomad/v2/plugins/drivers/utils" + "github.com/hashicorp/nomad/v2/plugins/shared/hclspec" + pstructs "github.com/hashicorp/nomad/v2/plugins/shared/structs" ) const ( diff --git a/drivers/java/driver_test.go b/drivers/java/driver_test.go index 6c3898f4b31..309f2f84c2d 100644 --- a/drivers/java/driver_test.go +++ b/drivers/java/driver_test.go @@ -13,18 +13,18 @@ import ( "testing" "time" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/client/lib/cgroupslib" - "github.com/hashicorp/nomad/client/lib/numalib" - ctestutil "github.com/hashicorp/nomad/client/testutil" - "github.com/hashicorp/nomad/helper/pluginutils/hclutils" - "github.com/hashicorp/nomad/helper/testlog" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/plugins/base" - "github.com/hashicorp/nomad/plugins/drivers" - dtestutil "github.com/hashicorp/nomad/plugins/drivers/testutils" - "github.com/hashicorp/nomad/testutil" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/client/lib/cgroupslib" + "github.com/hashicorp/nomad/v2/client/lib/numalib" + ctestutil "github.com/hashicorp/nomad/v2/client/testutil" + "github.com/hashicorp/nomad/v2/helper/pluginutils/hclutils" + "github.com/hashicorp/nomad/v2/helper/testlog" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/plugins/base" + "github.com/hashicorp/nomad/v2/plugins/drivers" + dtestutil "github.com/hashicorp/nomad/v2/plugins/drivers/testutils" + "github.com/hashicorp/nomad/v2/testutil" "github.com/shoenig/test/must" "github.com/stretchr/testify/require" ) diff --git a/drivers/java/handle.go b/drivers/java/handle.go index ef7bb171ec5..cd68f1036e9 100644 --- a/drivers/java/handle.go +++ b/drivers/java/handle.go @@ -11,8 +11,8 @@ import ( hclog "github.com/hashicorp/go-hclog" plugin "github.com/hashicorp/go-plugin" - "github.com/hashicorp/nomad/drivers/shared/executor" - "github.com/hashicorp/nomad/plugins/drivers" + "github.com/hashicorp/nomad/v2/drivers/shared/executor" + "github.com/hashicorp/nomad/v2/plugins/drivers" ) type taskHandle struct { diff --git a/drivers/java/utils_test.go b/drivers/java/utils_test.go index d29ba0d46ea..8eb0d3dfd7a 100644 --- a/drivers/java/utils_test.go +++ b/drivers/java/utils_test.go @@ -8,7 +8,7 @@ import ( "runtime" "testing" - "github.com/hashicorp/nomad/ci" + "github.com/hashicorp/nomad/v2/ci" "github.com/stretchr/testify/require" ) diff --git a/drivers/mock/command.go b/drivers/mock/command.go index 53c9fe69c29..0a8f11a7bf3 100644 --- a/drivers/mock/command.go +++ b/drivers/mock/command.go @@ -10,8 +10,8 @@ import ( "time" hclog "github.com/hashicorp/go-hclog" - bstructs "github.com/hashicorp/nomad/plugins/base/structs" - "github.com/hashicorp/nomad/plugins/drivers" + bstructs "github.com/hashicorp/nomad/v2/plugins/base/structs" + "github.com/hashicorp/nomad/v2/plugins/drivers" ) func runCommand(c Command, stdout, stderr io.WriteCloser, cancelCh <-chan struct{}, pluginExitTimer <-chan time.Time, logger hclog.Logger) *drivers.ExitResult { diff --git a/drivers/mock/driver.go b/drivers/mock/driver.go index 7969a9360ad..defcc8ec329 100644 --- a/drivers/mock/driver.go +++ b/drivers/mock/driver.go @@ -15,14 +15,14 @@ import ( "time" hclog "github.com/hashicorp/go-hclog" - "github.com/hashicorp/nomad/drivers/shared/eventer" - "github.com/hashicorp/nomad/helper/pluginutils/loader" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/plugins/base" - "github.com/hashicorp/nomad/plugins/drivers" - "github.com/hashicorp/nomad/plugins/drivers/fsisolation" - "github.com/hashicorp/nomad/plugins/shared/hclspec" - pstructs "github.com/hashicorp/nomad/plugins/shared/structs" + "github.com/hashicorp/nomad/v2/drivers/shared/eventer" + "github.com/hashicorp/nomad/v2/helper/pluginutils/loader" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/plugins/base" + "github.com/hashicorp/nomad/v2/plugins/drivers" + "github.com/hashicorp/nomad/v2/plugins/drivers/fsisolation" + "github.com/hashicorp/nomad/v2/plugins/shared/hclspec" + pstructs "github.com/hashicorp/nomad/v2/plugins/shared/structs" ) const ( diff --git a/drivers/mock/driver_test.go b/drivers/mock/driver_test.go index 3bb0d6a55b8..a8d45ac10e8 100644 --- a/drivers/mock/driver_test.go +++ b/drivers/mock/driver_test.go @@ -14,18 +14,18 @@ import ( "github.com/shoenig/test/must" "github.com/shoenig/test/wait" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/client/allocdir" - "github.com/hashicorp/nomad/client/taskenv" - "github.com/hashicorp/nomad/helper/testlog" - "github.com/hashicorp/nomad/helper/testtask" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" - basePlug "github.com/hashicorp/nomad/plugins/base" - "github.com/hashicorp/nomad/plugins/drivers" - "github.com/hashicorp/nomad/plugins/drivers/fsisolation" - dtestutil "github.com/hashicorp/nomad/plugins/drivers/testutils" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/client/allocdir" + "github.com/hashicorp/nomad/v2/client/taskenv" + "github.com/hashicorp/nomad/v2/helper/testlog" + "github.com/hashicorp/nomad/v2/helper/testtask" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" + basePlug "github.com/hashicorp/nomad/v2/plugins/base" + "github.com/hashicorp/nomad/v2/plugins/drivers" + "github.com/hashicorp/nomad/v2/plugins/drivers/fsisolation" + dtestutil "github.com/hashicorp/nomad/v2/plugins/drivers/testutils" ) func TestMockDriver_StartWaitRecoverWaitStop(t *testing.T) { diff --git a/drivers/mock/handle.go b/drivers/mock/handle.go index 73692e50b2d..494a84d7d81 100644 --- a/drivers/mock/handle.go +++ b/drivers/mock/handle.go @@ -9,8 +9,8 @@ import ( "time" hclog "github.com/hashicorp/go-hclog" - "github.com/hashicorp/nomad/client/lib/fifo" - "github.com/hashicorp/nomad/plugins/drivers" + "github.com/hashicorp/nomad/v2/client/lib/fifo" + "github.com/hashicorp/nomad/v2/plugins/drivers" ) // taskHandle supervises a mock task diff --git a/drivers/mock/utils_test.go b/drivers/mock/utils_test.go index 0ef3dbfe21d..7e3661de0ec 100644 --- a/drivers/mock/utils_test.go +++ b/drivers/mock/utils_test.go @@ -7,7 +7,7 @@ import ( "testing" "time" - "github.com/hashicorp/nomad/ci" + "github.com/hashicorp/nomad/v2/ci" "github.com/stretchr/testify/require" ) diff --git a/drivers/qemu/driver.go b/drivers/qemu/driver.go index e173329efc9..81228503262 100644 --- a/drivers/qemu/driver.go +++ b/drivers/qemu/driver.go @@ -18,16 +18,16 @@ import ( "time" "github.com/hashicorp/go-hclog" - "github.com/hashicorp/nomad/client/taskenv" - "github.com/hashicorp/nomad/drivers/shared/eventer" - "github.com/hashicorp/nomad/drivers/shared/executor" - "github.com/hashicorp/nomad/helper/pluginutils/hclutils" - "github.com/hashicorp/nomad/helper/pluginutils/loader" - "github.com/hashicorp/nomad/plugins/base" - "github.com/hashicorp/nomad/plugins/drivers" - "github.com/hashicorp/nomad/plugins/drivers/fsisolation" - "github.com/hashicorp/nomad/plugins/shared/hclspec" - pstructs "github.com/hashicorp/nomad/plugins/shared/structs" + "github.com/hashicorp/nomad/v2/client/taskenv" + "github.com/hashicorp/nomad/v2/drivers/shared/eventer" + "github.com/hashicorp/nomad/v2/drivers/shared/executor" + "github.com/hashicorp/nomad/v2/helper/pluginutils/hclutils" + "github.com/hashicorp/nomad/v2/helper/pluginutils/loader" + "github.com/hashicorp/nomad/v2/plugins/base" + "github.com/hashicorp/nomad/v2/plugins/drivers" + "github.com/hashicorp/nomad/v2/plugins/drivers/fsisolation" + "github.com/hashicorp/nomad/v2/plugins/shared/hclspec" + pstructs "github.com/hashicorp/nomad/v2/plugins/shared/structs" ) const ( diff --git a/drivers/qemu/driver_test.go b/drivers/qemu/driver_test.go index 74ea2cf12fd..56f952ff2ad 100644 --- a/drivers/qemu/driver_test.go +++ b/drivers/qemu/driver_test.go @@ -13,18 +13,18 @@ import ( "testing" "time" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/client/lib/cgroupslib" - "github.com/hashicorp/nomad/client/lib/numalib" - ctestutil "github.com/hashicorp/nomad/client/testutil" - "github.com/hashicorp/nomad/helper/pluginutils/hclutils" - "github.com/hashicorp/nomad/helper/testlog" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/plugins/base" - "github.com/hashicorp/nomad/plugins/drivers" - dtestutil "github.com/hashicorp/nomad/plugins/drivers/testutils" - "github.com/hashicorp/nomad/testutil" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/client/lib/cgroupslib" + "github.com/hashicorp/nomad/v2/client/lib/numalib" + ctestutil "github.com/hashicorp/nomad/v2/client/testutil" + "github.com/hashicorp/nomad/v2/helper/pluginutils/hclutils" + "github.com/hashicorp/nomad/v2/helper/testlog" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/plugins/base" + "github.com/hashicorp/nomad/v2/plugins/drivers" + dtestutil "github.com/hashicorp/nomad/v2/plugins/drivers/testutils" + "github.com/hashicorp/nomad/v2/testutil" "github.com/shoenig/test/must" ) diff --git a/drivers/qemu/handle.go b/drivers/qemu/handle.go index ff571dd1da4..0a97246d60c 100644 --- a/drivers/qemu/handle.go +++ b/drivers/qemu/handle.go @@ -11,8 +11,8 @@ import ( hclog "github.com/hashicorp/go-hclog" plugin "github.com/hashicorp/go-plugin" - "github.com/hashicorp/nomad/drivers/shared/executor" - "github.com/hashicorp/nomad/plugins/drivers" + "github.com/hashicorp/nomad/v2/drivers/shared/executor" + "github.com/hashicorp/nomad/v2/plugins/drivers" ) type taskHandle struct { diff --git a/drivers/rawexec/driver.go b/drivers/rawexec/driver.go index 7b8c4d8be8f..9f43fda4db1 100644 --- a/drivers/rawexec/driver.go +++ b/drivers/rawexec/driver.go @@ -16,18 +16,18 @@ import ( "github.com/hashicorp/consul-template/signals" "github.com/hashicorp/go-hclog" - "github.com/hashicorp/nomad/client/lib/cgroupslib" - "github.com/hashicorp/nomad/client/lib/cpustats" - "github.com/hashicorp/nomad/drivers/shared/eventer" - "github.com/hashicorp/nomad/drivers/shared/executor" - "github.com/hashicorp/nomad/drivers/shared/validators" - "github.com/hashicorp/nomad/helper/pluginutils/hclutils" - "github.com/hashicorp/nomad/helper/pluginutils/loader" - "github.com/hashicorp/nomad/plugins/base" - "github.com/hashicorp/nomad/plugins/drivers" - "github.com/hashicorp/nomad/plugins/drivers/fsisolation" - "github.com/hashicorp/nomad/plugins/shared/hclspec" - pstructs "github.com/hashicorp/nomad/plugins/shared/structs" + "github.com/hashicorp/nomad/v2/client/lib/cgroupslib" + "github.com/hashicorp/nomad/v2/client/lib/cpustats" + "github.com/hashicorp/nomad/v2/drivers/shared/eventer" + "github.com/hashicorp/nomad/v2/drivers/shared/executor" + "github.com/hashicorp/nomad/v2/drivers/shared/validators" + "github.com/hashicorp/nomad/v2/helper/pluginutils/hclutils" + "github.com/hashicorp/nomad/v2/helper/pluginutils/loader" + "github.com/hashicorp/nomad/v2/plugins/base" + "github.com/hashicorp/nomad/v2/plugins/drivers" + "github.com/hashicorp/nomad/v2/plugins/drivers/fsisolation" + "github.com/hashicorp/nomad/v2/plugins/shared/hclspec" + pstructs "github.com/hashicorp/nomad/v2/plugins/shared/structs" "github.com/ryanuber/go-glob" ) diff --git a/drivers/rawexec/driver_test.go b/drivers/rawexec/driver_test.go index bf9e57cd590..20a48c5dee7 100644 --- a/drivers/rawexec/driver_test.go +++ b/drivers/rawexec/driver_test.go @@ -16,22 +16,22 @@ import ( "testing" "time" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/client/lib/cgroupslib" - "github.com/hashicorp/nomad/client/lib/numalib" - - ctestutil "github.com/hashicorp/nomad/client/testutil" - "github.com/hashicorp/nomad/helper/pluginutils/hclutils" - "github.com/hashicorp/nomad/helper/testlog" - "github.com/hashicorp/nomad/helper/testtask" - "github.com/hashicorp/nomad/helper/uuid" - nstructs "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/plugins/base" - basePlug "github.com/hashicorp/nomad/plugins/base" - "github.com/hashicorp/nomad/plugins/drivers" - dtestutil "github.com/hashicorp/nomad/plugins/drivers/testutils" - pstructs "github.com/hashicorp/nomad/plugins/shared/structs" - "github.com/hashicorp/nomad/testutil" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/client/lib/cgroupslib" + "github.com/hashicorp/nomad/v2/client/lib/numalib" + + ctestutil "github.com/hashicorp/nomad/v2/client/testutil" + "github.com/hashicorp/nomad/v2/helper/pluginutils/hclutils" + "github.com/hashicorp/nomad/v2/helper/testlog" + "github.com/hashicorp/nomad/v2/helper/testtask" + "github.com/hashicorp/nomad/v2/helper/uuid" + nstructs "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/plugins/base" + basePlug "github.com/hashicorp/nomad/v2/plugins/base" + "github.com/hashicorp/nomad/v2/plugins/drivers" + dtestutil "github.com/hashicorp/nomad/v2/plugins/drivers/testutils" + pstructs "github.com/hashicorp/nomad/v2/plugins/shared/structs" + "github.com/hashicorp/nomad/v2/testutil" "github.com/shoenig/test/must" "github.com/shoenig/test/wait" ) diff --git a/drivers/rawexec/driver_unix.go b/drivers/rawexec/driver_unix.go index 393701e66ca..b1d17c0cf3d 100644 --- a/drivers/rawexec/driver_unix.go +++ b/drivers/rawexec/driver_unix.go @@ -8,8 +8,8 @@ package rawexec import ( "fmt" - "github.com/hashicorp/nomad/helper/users" - "github.com/hashicorp/nomad/plugins/drivers" + "github.com/hashicorp/nomad/v2/helper/users" + "github.com/hashicorp/nomad/v2/plugins/drivers" ) func (d *Driver) Validate(cfg drivers.TaskConfig) error { diff --git a/drivers/rawexec/driver_unix_test.go b/drivers/rawexec/driver_unix_test.go index 528b37f2e31..ebb2de3a432 100644 --- a/drivers/rawexec/driver_unix_test.go +++ b/drivers/rawexec/driver_unix_test.go @@ -20,16 +20,16 @@ import ( "testing" "time" - "github.com/hashicorp/nomad/ci" - clienttestutil "github.com/hashicorp/nomad/client/testutil" - "github.com/hashicorp/nomad/helper/testtask" - "github.com/hashicorp/nomad/helper/users" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/plugins/base" - basePlug "github.com/hashicorp/nomad/plugins/base" - "github.com/hashicorp/nomad/plugins/drivers" - dtestutil "github.com/hashicorp/nomad/plugins/drivers/testutils" - "github.com/hashicorp/nomad/testutil" + "github.com/hashicorp/nomad/v2/ci" + clienttestutil "github.com/hashicorp/nomad/v2/client/testutil" + "github.com/hashicorp/nomad/v2/helper/testtask" + "github.com/hashicorp/nomad/v2/helper/users" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/plugins/base" + basePlug "github.com/hashicorp/nomad/v2/plugins/base" + "github.com/hashicorp/nomad/v2/plugins/drivers" + dtestutil "github.com/hashicorp/nomad/v2/plugins/drivers/testutils" + "github.com/hashicorp/nomad/v2/testutil" "github.com/shoenig/test/must" "github.com/stretchr/testify/require" "golang.org/x/sys/unix" diff --git a/drivers/rawexec/driver_windows.go b/drivers/rawexec/driver_windows.go index 6b00b78af17..4789dc02416 100644 --- a/drivers/rawexec/driver_windows.go +++ b/drivers/rawexec/driver_windows.go @@ -6,7 +6,7 @@ package rawexec import ( - "github.com/hashicorp/nomad/plugins/drivers" + "github.com/hashicorp/nomad/v2/plugins/drivers" ) func (d *Driver) Validate(cfg drivers.TaskConfig) error { diff --git a/drivers/rawexec/driver_windows_test.go b/drivers/rawexec/driver_windows_test.go index 3343edb070a..96ef913626f 100644 --- a/drivers/rawexec/driver_windows_test.go +++ b/drivers/rawexec/driver_windows_test.go @@ -10,11 +10,11 @@ import ( "testing" "time" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/plugins/base" - "github.com/hashicorp/nomad/plugins/drivers" - dtestutil "github.com/hashicorp/nomad/plugins/drivers/testutils" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/plugins/base" + "github.com/hashicorp/nomad/v2/plugins/drivers" + dtestutil "github.com/hashicorp/nomad/v2/plugins/drivers/testutils" "github.com/shoenig/test/must" ) diff --git a/drivers/rawexec/handle.go b/drivers/rawexec/handle.go index 5e06f875ff6..3ac4cddad83 100644 --- a/drivers/rawexec/handle.go +++ b/drivers/rawexec/handle.go @@ -11,8 +11,8 @@ import ( hclog "github.com/hashicorp/go-hclog" plugin "github.com/hashicorp/go-plugin" - "github.com/hashicorp/nomad/drivers/shared/executor" - "github.com/hashicorp/nomad/plugins/drivers" + "github.com/hashicorp/nomad/v2/drivers/shared/executor" + "github.com/hashicorp/nomad/v2/plugins/drivers" ) type taskHandle struct { diff --git a/drivers/shared/capabilities/defaults_test.go b/drivers/shared/capabilities/defaults_test.go index 6782c95d477..ff275876318 100644 --- a/drivers/shared/capabilities/defaults_test.go +++ b/drivers/shared/capabilities/defaults_test.go @@ -8,7 +8,7 @@ import ( "strings" "testing" - "github.com/hashicorp/nomad/ci" + "github.com/hashicorp/nomad/v2/ci" "github.com/moby/moby/api/types/system" "github.com/shoenig/test/must" ) diff --git a/drivers/shared/capabilities/set_test.go b/drivers/shared/capabilities/set_test.go index c4670d9df7e..1fb182772db 100644 --- a/drivers/shared/capabilities/set_test.go +++ b/drivers/shared/capabilities/set_test.go @@ -6,7 +6,7 @@ package capabilities import ( "testing" - "github.com/hashicorp/nomad/ci" + "github.com/hashicorp/nomad/v2/ci" "github.com/stretchr/testify/require" ) diff --git a/drivers/shared/eventer/eventer.go b/drivers/shared/eventer/eventer.go index c2cb1095934..11d2237a70d 100644 --- a/drivers/shared/eventer/eventer.go +++ b/drivers/shared/eventer/eventer.go @@ -9,8 +9,8 @@ import ( "time" hclog "github.com/hashicorp/go-hclog" - "github.com/hashicorp/nomad/helper" - "github.com/hashicorp/nomad/plugins/drivers" + "github.com/hashicorp/nomad/v2/helper" + "github.com/hashicorp/nomad/v2/plugins/drivers" ) var ( diff --git a/drivers/shared/eventer/eventer_test.go b/drivers/shared/eventer/eventer_test.go index b135657b75e..04cedc9d2dd 100644 --- a/drivers/shared/eventer/eventer_test.go +++ b/drivers/shared/eventer/eventer_test.go @@ -9,9 +9,9 @@ import ( "testing" "time" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/helper/testlog" - "github.com/hashicorp/nomad/plugins/drivers" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/helper/testlog" + "github.com/hashicorp/nomad/v2/plugins/drivers" "github.com/stretchr/testify/require" ) diff --git a/drivers/shared/executor/exec_utils.go b/drivers/shared/executor/exec_utils.go index 7ac1a1996f9..5b6e3e3883b 100644 --- a/drivers/shared/executor/exec_utils.go +++ b/drivers/shared/executor/exec_utils.go @@ -13,8 +13,8 @@ import ( "syscall" hclog "github.com/hashicorp/go-hclog" - "github.com/hashicorp/nomad/plugins/drivers" - dproto "github.com/hashicorp/nomad/plugins/drivers/proto" + "github.com/hashicorp/nomad/v2/plugins/drivers" + dproto "github.com/hashicorp/nomad/v2/plugins/drivers/proto" ) // execHelper is a convenient wrapper for starting and executing commands, and handling their output diff --git a/drivers/shared/executor/executor.go b/drivers/shared/executor/executor.go index 76034f39f3b..26b47bd6d32 100644 --- a/drivers/shared/executor/executor.go +++ b/drivers/shared/executor/executor.go @@ -21,13 +21,13 @@ import ( "github.com/hashicorp/consul-template/signals" hclog "github.com/hashicorp/go-hclog" multierror "github.com/hashicorp/go-multierror" - "github.com/hashicorp/nomad/client/allocdir" - "github.com/hashicorp/nomad/client/lib/cgroupslib" - "github.com/hashicorp/nomad/client/lib/cpustats" - "github.com/hashicorp/nomad/client/lib/fifo" - cstructs "github.com/hashicorp/nomad/client/structs" - "github.com/hashicorp/nomad/drivers/shared/executor/procstats" - "github.com/hashicorp/nomad/plugins/drivers" + "github.com/hashicorp/nomad/v2/client/allocdir" + "github.com/hashicorp/nomad/v2/client/lib/cgroupslib" + "github.com/hashicorp/nomad/v2/client/lib/cpustats" + "github.com/hashicorp/nomad/v2/client/lib/fifo" + cstructs "github.com/hashicorp/nomad/v2/client/structs" + "github.com/hashicorp/nomad/v2/drivers/shared/executor/procstats" + "github.com/hashicorp/nomad/v2/plugins/drivers" "github.com/moby/sys/capability" ) diff --git a/drivers/shared/executor/executor_basic.go b/drivers/shared/executor/executor_basic.go index 33373593d91..e5e3944302d 100644 --- a/drivers/shared/executor/executor_basic.go +++ b/drivers/shared/executor/executor_basic.go @@ -10,9 +10,9 @@ import ( "github.com/hashicorp/go-hclog" "github.com/hashicorp/go-set/v3" - "github.com/hashicorp/nomad/client/lib/cpustats" - "github.com/hashicorp/nomad/drivers/shared/executor/procstats" - "github.com/hashicorp/nomad/plugins/drivers" + "github.com/hashicorp/nomad/v2/client/lib/cpustats" + "github.com/hashicorp/nomad/v2/drivers/shared/executor/procstats" + "github.com/hashicorp/nomad/v2/plugins/drivers" ) func NewExecutorWithIsolation(logger hclog.Logger, compute cpustats.Compute) Executor { diff --git a/drivers/shared/executor/executor_linux.go b/drivers/shared/executor/executor_linux.go index 6c7558b39d7..ed8ea3ed54c 100644 --- a/drivers/shared/executor/executor_linux.go +++ b/drivers/shared/executor/executor_linux.go @@ -7,8 +7,8 @@ package executor import ( hclog "github.com/hashicorp/go-hclog" - "github.com/hashicorp/nomad/client/lib/cpustats" - "github.com/hashicorp/nomad/drivers/shared/executor/procstats" + "github.com/hashicorp/nomad/v2/client/lib/cpustats" + "github.com/hashicorp/nomad/v2/drivers/shared/executor/procstats" ) // NewExecutorWithIsolation returns universal executor if CGO is disabled. This diff --git a/drivers/shared/executor/executor_linux_cgo.go b/drivers/shared/executor/executor_linux_cgo.go index c2538b9b0b4..8e02dce01dd 100644 --- a/drivers/shared/executor/executor_linux_cgo.go +++ b/drivers/shared/executor/executor_linux_cgo.go @@ -24,16 +24,16 @@ import ( "github.com/hashicorp/consul-template/signals" hclog "github.com/hashicorp/go-hclog" "github.com/hashicorp/go-set/v3" - "github.com/hashicorp/nomad/client/allocdir" - "github.com/hashicorp/nomad/client/lib/cgroupslib" - "github.com/hashicorp/nomad/client/lib/cpustats" - cstructs "github.com/hashicorp/nomad/client/structs" - "github.com/hashicorp/nomad/drivers/shared/capabilities" - "github.com/hashicorp/nomad/drivers/shared/executor/procstats" - "github.com/hashicorp/nomad/helper/users" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/plugins/drivers" + "github.com/hashicorp/nomad/v2/client/allocdir" + "github.com/hashicorp/nomad/v2/client/lib/cgroupslib" + "github.com/hashicorp/nomad/v2/client/lib/cpustats" + cstructs "github.com/hashicorp/nomad/v2/client/structs" + "github.com/hashicorp/nomad/v2/drivers/shared/capabilities" + "github.com/hashicorp/nomad/v2/drivers/shared/executor/procstats" + "github.com/hashicorp/nomad/v2/helper/users" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/plugins/drivers" "github.com/opencontainers/cgroups" _ "github.com/opencontainers/cgroups/devices" "github.com/opencontainers/runc/libcontainer" diff --git a/drivers/shared/executor/executor_linux_test.go b/drivers/shared/executor/executor_linux_test.go index cb00b8c1e31..0dd1b14a83f 100644 --- a/drivers/shared/executor/executor_linux_test.go +++ b/drivers/shared/executor/executor_linux_test.go @@ -17,18 +17,18 @@ import ( "testing" "time" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/client/allocdir" - "github.com/hashicorp/nomad/client/lib/cgroupslib" - "github.com/hashicorp/nomad/client/lib/cpustats" - "github.com/hashicorp/nomad/client/taskenv" - "github.com/hashicorp/nomad/client/testutil" - "github.com/hashicorp/nomad/drivers/shared/capabilities" - "github.com/hashicorp/nomad/helper/testlog" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/plugins/drivers" - "github.com/hashicorp/nomad/plugins/drivers/fsisolation" - tu "github.com/hashicorp/nomad/testutil" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/client/allocdir" + "github.com/hashicorp/nomad/v2/client/lib/cgroupslib" + "github.com/hashicorp/nomad/v2/client/lib/cpustats" + "github.com/hashicorp/nomad/v2/client/taskenv" + "github.com/hashicorp/nomad/v2/client/testutil" + "github.com/hashicorp/nomad/v2/drivers/shared/capabilities" + "github.com/hashicorp/nomad/v2/helper/testlog" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/plugins/drivers" + "github.com/hashicorp/nomad/v2/plugins/drivers/fsisolation" + tu "github.com/hashicorp/nomad/v2/testutil" lconfigs "github.com/opencontainers/runc/libcontainer/configs" "github.com/opencontainers/runc/libcontainer/devices" "github.com/opencontainers/runtime-spec/specs-go" diff --git a/drivers/shared/executor/executor_plugin.go b/drivers/shared/executor/executor_plugin.go index 7c6a419cf3e..13c5a7ed5d3 100644 --- a/drivers/shared/executor/executor_plugin.go +++ b/drivers/shared/executor/executor_plugin.go @@ -8,8 +8,8 @@ import ( "github.com/hashicorp/go-hclog" "github.com/hashicorp/go-plugin" - "github.com/hashicorp/nomad/client/lib/cpustats" - "github.com/hashicorp/nomad/drivers/shared/executor/proto" + "github.com/hashicorp/nomad/v2/client/lib/cpustats" + "github.com/hashicorp/nomad/v2/drivers/shared/executor/proto" "google.golang.org/grpc" ) diff --git a/drivers/shared/executor/executor_test.go b/drivers/shared/executor/executor_test.go index dca6b201755..a1adc8fa4c0 100644 --- a/drivers/shared/executor/executor_test.go +++ b/drivers/shared/executor/executor_test.go @@ -18,20 +18,20 @@ import ( "time" "github.com/hashicorp/go-hclog" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/client/allocdir" - "github.com/hashicorp/nomad/client/lib/cgroupslib" - "github.com/hashicorp/nomad/client/lib/cpustats" - "github.com/hashicorp/nomad/client/lib/numalib" - "github.com/hashicorp/nomad/client/taskenv" - "github.com/hashicorp/nomad/client/testutil" - "github.com/hashicorp/nomad/helper/testlog" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/plugins/base" - "github.com/hashicorp/nomad/plugins/drivers" - "github.com/hashicorp/nomad/plugins/drivers/fsisolation" - tu "github.com/hashicorp/nomad/testutil" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/client/allocdir" + "github.com/hashicorp/nomad/v2/client/lib/cgroupslib" + "github.com/hashicorp/nomad/v2/client/lib/cpustats" + "github.com/hashicorp/nomad/v2/client/lib/numalib" + "github.com/hashicorp/nomad/v2/client/taskenv" + "github.com/hashicorp/nomad/v2/client/testutil" + "github.com/hashicorp/nomad/v2/helper/testlog" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/plugins/base" + "github.com/hashicorp/nomad/v2/plugins/drivers" + "github.com/hashicorp/nomad/v2/plugins/drivers/fsisolation" + tu "github.com/hashicorp/nomad/v2/testutil" ps "github.com/mitchellh/go-ps" "github.com/shoenig/test/must" "github.com/stretchr/testify/assert" diff --git a/drivers/shared/executor/executor_universal_linux.go b/drivers/shared/executor/executor_universal_linux.go index 0a1e4ae3f45..ffa06100eae 100644 --- a/drivers/shared/executor/executor_universal_linux.go +++ b/drivers/shared/executor/executor_universal_linux.go @@ -13,10 +13,10 @@ import ( "syscall" "github.com/hashicorp/go-set/v3" - "github.com/hashicorp/nomad/client/lib/cgroupslib" - "github.com/hashicorp/nomad/client/lib/nsutil" - "github.com/hashicorp/nomad/drivers/shared/executor/procstats" - "github.com/hashicorp/nomad/plugins/drivers" + "github.com/hashicorp/nomad/v2/client/lib/cgroupslib" + "github.com/hashicorp/nomad/v2/client/lib/nsutil" + "github.com/hashicorp/nomad/v2/drivers/shared/executor/procstats" + "github.com/hashicorp/nomad/v2/plugins/drivers" "github.com/opencontainers/cgroups" "golang.org/x/sys/unix" ) diff --git a/drivers/shared/executor/executor_universal_linux_test.go b/drivers/shared/executor/executor_universal_linux_test.go index ded92c58794..abca93c1bde 100644 --- a/drivers/shared/executor/executor_universal_linux_test.go +++ b/drivers/shared/executor/executor_universal_linux_test.go @@ -13,10 +13,10 @@ import ( "strings" "testing" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/client/lib/cgroupslib" - "github.com/hashicorp/nomad/client/testutil" - "github.com/hashicorp/nomad/helper/testlog" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/client/lib/cgroupslib" + "github.com/hashicorp/nomad/v2/client/testutil" + "github.com/hashicorp/nomad/v2/helper/testlog" "github.com/shoenig/test/must" ) diff --git a/drivers/shared/executor/executor_unix.go b/drivers/shared/executor/executor_unix.go index 7245a1c1d55..b19abe1a880 100644 --- a/drivers/shared/executor/executor_unix.go +++ b/drivers/shared/executor/executor_unix.go @@ -12,7 +12,7 @@ import ( "strconv" "syscall" - "github.com/hashicorp/nomad/helper/users" + "github.com/hashicorp/nomad/v2/helper/users" ) // configure new process group for child process diff --git a/drivers/shared/executor/executor_windows.go b/drivers/shared/executor/executor_windows.go index 29e0c221d2d..fd928a04b9f 100644 --- a/drivers/shared/executor/executor_windows.go +++ b/drivers/shared/executor/executor_windows.go @@ -17,9 +17,9 @@ import ( hclog "github.com/hashicorp/go-hclog" "github.com/hashicorp/go-set/v3" - "github.com/hashicorp/nomad/client/lib/cpustats" - "github.com/hashicorp/nomad/drivers/shared/executor/procstats" - "github.com/hashicorp/nomad/plugins/drivers" + "github.com/hashicorp/nomad/v2/client/lib/cpustats" + "github.com/hashicorp/nomad/v2/drivers/shared/executor/procstats" + "github.com/hashicorp/nomad/v2/plugins/drivers" "golang.org/x/sys/windows" ) diff --git a/drivers/shared/executor/executor_windows_test.go b/drivers/shared/executor/executor_windows_test.go index 422e9b9bbd2..ccd92bd8d61 100644 --- a/drivers/shared/executor/executor_windows_test.go +++ b/drivers/shared/executor/executor_windows_test.go @@ -11,15 +11,15 @@ import ( "testing" "time" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/client/allocdir" - "github.com/hashicorp/nomad/client/lib/numalib" - "github.com/hashicorp/nomad/client/taskenv" - "github.com/hashicorp/nomad/helper/testlog" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/plugins/drivers" - "github.com/hashicorp/nomad/plugins/drivers/fsisolation" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/client/allocdir" + "github.com/hashicorp/nomad/v2/client/lib/numalib" + "github.com/hashicorp/nomad/v2/client/taskenv" + "github.com/hashicorp/nomad/v2/helper/testlog" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/plugins/drivers" + "github.com/hashicorp/nomad/v2/plugins/drivers/fsisolation" "github.com/shoenig/test/must" ) diff --git a/drivers/shared/executor/grpc_client.go b/drivers/shared/executor/grpc_client.go index 5405590afc3..c316704a58b 100644 --- a/drivers/shared/executor/grpc_client.go +++ b/drivers/shared/executor/grpc_client.go @@ -14,11 +14,11 @@ import ( "github.com/LK4D4/joincontext" "github.com/golang/protobuf/ptypes" hclog "github.com/hashicorp/go-hclog" - cstructs "github.com/hashicorp/nomad/client/structs" - "github.com/hashicorp/nomad/drivers/shared/executor/proto" - "github.com/hashicorp/nomad/helper/pluginutils/grpcutils" - "github.com/hashicorp/nomad/plugins/drivers" - dproto "github.com/hashicorp/nomad/plugins/drivers/proto" + cstructs "github.com/hashicorp/nomad/v2/client/structs" + "github.com/hashicorp/nomad/v2/drivers/shared/executor/proto" + "github.com/hashicorp/nomad/v2/helper/pluginutils/grpcutils" + "github.com/hashicorp/nomad/v2/plugins/drivers" + dproto "github.com/hashicorp/nomad/v2/plugins/drivers/proto" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/drivers/shared/executor/grpc_server.go b/drivers/shared/executor/grpc_server.go index aa230776ec8..147822e42e1 100644 --- a/drivers/shared/executor/grpc_server.go +++ b/drivers/shared/executor/grpc_server.go @@ -13,10 +13,10 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - "github.com/hashicorp/nomad/drivers/shared/executor/proto" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/plugins/drivers" - sproto "github.com/hashicorp/nomad/plugins/shared/structs/proto" + "github.com/hashicorp/nomad/v2/drivers/shared/executor/proto" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/plugins/drivers" + sproto "github.com/hashicorp/nomad/v2/plugins/shared/structs/proto" ) type grpcExecutorServer struct { diff --git a/drivers/shared/executor/plugins.go b/drivers/shared/executor/plugins.go index 8b3f73ca150..045a1831ca8 100644 --- a/drivers/shared/executor/plugins.go +++ b/drivers/shared/executor/plugins.go @@ -8,7 +8,7 @@ import ( "github.com/hashicorp/go-hclog" "github.com/hashicorp/go-plugin" - "github.com/hashicorp/nomad/client/lib/cpustats" + "github.com/hashicorp/nomad/v2/client/lib/cpustats" ) // ExecutorConfig is the config that Nomad passes to the executor diff --git a/drivers/shared/executor/procstats/getstats.go b/drivers/shared/executor/procstats/getstats.go index 561b6fc90fa..963d9bd5b1d 100644 --- a/drivers/shared/executor/procstats/getstats.go +++ b/drivers/shared/executor/procstats/getstats.go @@ -9,8 +9,8 @@ import ( "sync" "time" - "github.com/hashicorp/nomad/client/lib/cpustats" - "github.com/hashicorp/nomad/plugins/drivers" + "github.com/hashicorp/nomad/v2/client/lib/cpustats" + "github.com/hashicorp/nomad/v2/plugins/drivers" "github.com/shirou/gopsutil/v3/process" ) diff --git a/drivers/shared/executor/procstats/getstats_test.go b/drivers/shared/executor/procstats/getstats_test.go index 3336f56079c..dac2c163b87 100644 --- a/drivers/shared/executor/procstats/getstats_test.go +++ b/drivers/shared/executor/procstats/getstats_test.go @@ -8,7 +8,7 @@ import ( "time" "github.com/hashicorp/go-set/v3" - "github.com/hashicorp/nomad/client/lib/cpustats" + "github.com/hashicorp/nomad/v2/client/lib/cpustats" "github.com/shoenig/test/must" ) diff --git a/drivers/shared/executor/procstats/list_default.go b/drivers/shared/executor/procstats/list_default.go index 7b72cebe59e..dc7276fce37 100644 --- a/drivers/shared/executor/procstats/list_default.go +++ b/drivers/shared/executor/procstats/list_default.go @@ -10,7 +10,7 @@ import ( "time" "github.com/hashicorp/go-set/v3" - "github.com/hashicorp/nomad/lib/lang" + "github.com/hashicorp/nomad/v2/lib/lang" "github.com/shirou/gopsutil/v3/process" ) diff --git a/drivers/shared/executor/procstats/list_linux.go b/drivers/shared/executor/procstats/list_linux.go index d254c1d0740..855a60a514d 100644 --- a/drivers/shared/executor/procstats/list_linux.go +++ b/drivers/shared/executor/procstats/list_linux.go @@ -7,7 +7,7 @@ package procstats import ( "github.com/hashicorp/go-set/v3" - "github.com/hashicorp/nomad/client/lib/cgroupslib" + "github.com/hashicorp/nomad/v2/client/lib/cgroupslib" ) type Cgrouper interface { diff --git a/drivers/shared/executor/procstats/procstats.go b/drivers/shared/executor/procstats/procstats.go index fa16d9ef7fb..34b2a560701 100644 --- a/drivers/shared/executor/procstats/procstats.go +++ b/drivers/shared/executor/procstats/procstats.go @@ -7,8 +7,8 @@ import ( "time" "github.com/hashicorp/go-set/v3" - "github.com/hashicorp/nomad/client/lib/cpustats" - "github.com/hashicorp/nomad/plugins/drivers" + "github.com/hashicorp/nomad/v2/client/lib/cpustats" + "github.com/hashicorp/nomad/v2/plugins/drivers" "github.com/mitchellh/go-ps" ) diff --git a/drivers/shared/executor/proto/executor.pb.go b/drivers/shared/executor/proto/executor.pb.go index 71e54ff573f..82fbcb0d7e3 100644 --- a/drivers/shared/executor/proto/executor.pb.go +++ b/drivers/shared/executor/proto/executor.pb.go @@ -8,7 +8,7 @@ import ( fmt "fmt" proto "github.com/golang/protobuf/proto" timestamp "github.com/golang/protobuf/ptypes/timestamp" - proto1 "github.com/hashicorp/nomad/plugins/drivers/proto" + proto1 "github.com/hashicorp/nomad/v2/plugins/drivers/proto" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" diff --git a/drivers/shared/executor/utils.go b/drivers/shared/executor/utils.go index 9abbb2c2f9a..42fa19a189f 100644 --- a/drivers/shared/executor/utils.go +++ b/drivers/shared/executor/utils.go @@ -12,10 +12,10 @@ import ( "github.com/golang/protobuf/ptypes" hclog "github.com/hashicorp/go-hclog" plugin "github.com/hashicorp/go-plugin" - "github.com/hashicorp/nomad/client/lib/cpustats" - "github.com/hashicorp/nomad/drivers/shared/executor/proto" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/plugins/base" + "github.com/hashicorp/nomad/v2/client/lib/cpustats" + "github.com/hashicorp/nomad/v2/drivers/shared/executor/proto" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/plugins/base" ) const ( diff --git a/drivers/shared/executor/utils_test.go b/drivers/shared/executor/utils_test.go index 383d937d573..da4d4889f88 100644 --- a/drivers/shared/executor/utils_test.go +++ b/drivers/shared/executor/utils_test.go @@ -11,8 +11,8 @@ import ( "sync" "testing" - "github.com/hashicorp/nomad/client/allocdir" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/client/allocdir" + "github.com/hashicorp/nomad/v2/nomad/structs" "github.com/shoenig/test/must" "github.com/stretchr/testify/require" ) diff --git a/drivers/shared/executor/z_executor_cmd.go b/drivers/shared/executor/z_executor_cmd.go index 2e6cb4a9c38..64e5da3299c 100644 --- a/drivers/shared/executor/z_executor_cmd.go +++ b/drivers/shared/executor/z_executor_cmd.go @@ -9,7 +9,7 @@ import ( "github.com/hashicorp/go-hclog" "github.com/hashicorp/go-plugin" - "github.com/hashicorp/nomad/plugins/base" + "github.com/hashicorp/nomad/v2/plugins/base" ) // Install a plugin cli handler to ease working with tests diff --git a/drivers/shared/hostnames/mount.go b/drivers/shared/hostnames/mount.go index 133ff8f043f..0cf6b3ac46e 100644 --- a/drivers/shared/hostnames/mount.go +++ b/drivers/shared/hostnames/mount.go @@ -10,7 +10,7 @@ import ( "path/filepath" "strings" - "github.com/hashicorp/nomad/plugins/drivers" + "github.com/hashicorp/nomad/v2/plugins/drivers" ) // GenerateEtcHostsMount writes a /etc/hosts file using the network spec's diff --git a/drivers/shared/hostnames/mount_unix_test.go b/drivers/shared/hostnames/mount_unix_test.go index e7e6ec7d971..a3cce550285 100644 --- a/drivers/shared/hostnames/mount_unix_test.go +++ b/drivers/shared/hostnames/mount_unix_test.go @@ -11,7 +11,7 @@ import ( "path/filepath" "testing" - "github.com/hashicorp/nomad/plugins/drivers" + "github.com/hashicorp/nomad/v2/plugins/drivers" "github.com/stretchr/testify/require" ) diff --git a/drivers/shared/resolvconf/mount.go b/drivers/shared/resolvconf/mount.go index bc19f39cdc1..2a1930b7108 100644 --- a/drivers/shared/resolvconf/mount.go +++ b/drivers/shared/resolvconf/mount.go @@ -8,8 +8,8 @@ import ( "os" "path/filepath" - "github.com/hashicorp/nomad/lib/resolvconf" - "github.com/hashicorp/nomad/plugins/drivers" + "github.com/hashicorp/nomad/v2/lib/resolvconf" + "github.com/hashicorp/nomad/v2/plugins/drivers" ) func GenerateDNSMount(taskDir string, conf *drivers.DNSConfig) (*drivers.MountConfig, error) { diff --git a/drivers/shared/resolvconf/mount_unix_test.go b/drivers/shared/resolvconf/mount_unix_test.go index f33fc349991..44a7808f873 100644 --- a/drivers/shared/resolvconf/mount_unix_test.go +++ b/drivers/shared/resolvconf/mount_unix_test.go @@ -10,7 +10,7 @@ import ( "path/filepath" "testing" - "github.com/hashicorp/nomad/lib/resolvconf" + "github.com/hashicorp/nomad/v2/lib/resolvconf" "github.com/shoenig/test/must" ) diff --git a/drivers/shared/validators/validators.go b/drivers/shared/validators/validators.go index d0cdbd3c4c5..0df1bc3577d 100644 --- a/drivers/shared/validators/validators.go +++ b/drivers/shared/validators/validators.go @@ -10,8 +10,8 @@ import ( "strings" "github.com/hashicorp/go-hclog" - "github.com/hashicorp/nomad/client/lib/idset" - "github.com/hashicorp/nomad/helper/users" + "github.com/hashicorp/nomad/v2/client/lib/idset" + "github.com/hashicorp/nomad/v2/helper/users" ) var ( diff --git a/e2e/acl/acl_role_test.go b/e2e/acl/acl_role_test.go index 58a354dc912..0742d9f7625 100644 --- a/e2e/acl/acl_role_test.go +++ b/e2e/acl/acl_role_test.go @@ -8,8 +8,8 @@ import ( "testing" "github.com/hashicorp/nomad/api" - "github.com/hashicorp/nomad/e2e/e2eutil" - "github.com/hashicorp/nomad/helper/uuid" + "github.com/hashicorp/nomad/v2/e2e/e2eutil" + "github.com/hashicorp/nomad/v2/helper/uuid" "github.com/shoenig/test/must" ) diff --git a/e2e/acl/acl_test.go b/e2e/acl/acl_test.go index 135aa761665..a0bee4addf6 100644 --- a/e2e/acl/acl_test.go +++ b/e2e/acl/acl_test.go @@ -6,7 +6,7 @@ package acl import ( "testing" - "github.com/hashicorp/nomad/e2e/e2eutil" + "github.com/hashicorp/nomad/v2/e2e/e2eutil" ) func TestACL(t *testing.T) { diff --git a/e2e/acl/acl_token_test.go b/e2e/acl/acl_token_test.go index f5af9761d68..146e64d35ee 100644 --- a/e2e/acl/acl_token_test.go +++ b/e2e/acl/acl_token_test.go @@ -9,8 +9,8 @@ import ( "time" "github.com/hashicorp/nomad/api" - "github.com/hashicorp/nomad/e2e/e2eutil" - "github.com/hashicorp/nomad/helper/uuid" + "github.com/hashicorp/nomad/v2/e2e/e2eutil" + "github.com/hashicorp/nomad/v2/helper/uuid" "github.com/shoenig/test/must" ) diff --git a/e2e/affinities/affinities.go b/e2e/affinities/affinities.go index e80bcf22387..0b54d241d88 100644 --- a/e2e/affinities/affinities.go +++ b/e2e/affinities/affinities.go @@ -9,9 +9,9 @@ import ( "github.com/shoenig/test/must" "github.com/stretchr/testify/require" - "github.com/hashicorp/nomad/e2e/e2eutil" - "github.com/hashicorp/nomad/e2e/framework" - "github.com/hashicorp/nomad/helper/uuid" + "github.com/hashicorp/nomad/v2/e2e/e2eutil" + "github.com/hashicorp/nomad/v2/e2e/framework" + "github.com/hashicorp/nomad/v2/helper/uuid" ) type BasicAffinityTest struct { diff --git a/e2e/alloc_logs/alloc_logs_test.go b/e2e/alloc_logs/alloc_logs_test.go index 15970f38d2a..a76848e29b5 100644 --- a/e2e/alloc_logs/alloc_logs_test.go +++ b/e2e/alloc_logs/alloc_logs_test.go @@ -6,8 +6,8 @@ package alloc_logs import ( "testing" - "github.com/hashicorp/nomad/e2e/e2eutil" - "github.com/hashicorp/nomad/helper/uuid" + "github.com/hashicorp/nomad/v2/e2e/e2eutil" + "github.com/hashicorp/nomad/v2/helper/uuid" "github.com/shoenig/test/must" ) diff --git a/e2e/allocexec/docker_exec_test.go b/e2e/allocexec/docker_exec_test.go index 6346ed13cd8..d858b5b2b7a 100644 --- a/e2e/allocexec/docker_exec_test.go +++ b/e2e/allocexec/docker_exec_test.go @@ -13,8 +13,8 @@ import ( "time" nomadapi "github.com/hashicorp/nomad/api" - "github.com/hashicorp/nomad/e2e/v3/cluster3" - "github.com/hashicorp/nomad/e2e/v3/jobs3" + "github.com/hashicorp/nomad/v2/e2e/v3/cluster3" + "github.com/hashicorp/nomad/v2/e2e/v3/jobs3" "github.com/shoenig/test/must" ) diff --git a/e2e/artifact/artifact_test.go b/e2e/artifact/artifact_test.go index 123a76017b6..51d40d8f097 100644 --- a/e2e/artifact/artifact_test.go +++ b/e2e/artifact/artifact_test.go @@ -7,8 +7,8 @@ import ( "testing" "github.com/hashicorp/nomad/api" - "github.com/hashicorp/nomad/e2e/e2eutil" - "github.com/hashicorp/nomad/helper/uuid" + "github.com/hashicorp/nomad/v2/e2e/e2eutil" + "github.com/hashicorp/nomad/v2/helper/uuid" "github.com/shoenig/test/must" ) diff --git a/e2e/auth/auth_test.go b/e2e/auth/auth_test.go index a7c9a73cfba..180567f593f 100644 --- a/e2e/auth/auth_test.go +++ b/e2e/auth/auth_test.go @@ -10,8 +10,8 @@ import ( "time" "github.com/hashicorp/nomad/api" - "github.com/hashicorp/nomad/e2e/e2eutil" - "github.com/hashicorp/nomad/helper/uuid" + "github.com/hashicorp/nomad/v2/e2e/e2eutil" + "github.com/hashicorp/nomad/v2/helper/uuid" "github.com/shoenig/test/must" ) diff --git a/e2e/batch_timeout/batch_timeout_test.go b/e2e/batch_timeout/batch_timeout_test.go index 8983dfb1368..f0de59ced5b 100644 --- a/e2e/batch_timeout/batch_timeout_test.go +++ b/e2e/batch_timeout/batch_timeout_test.go @@ -9,9 +9,9 @@ import ( "time" nomadapi "github.com/hashicorp/nomad/api" - "github.com/hashicorp/nomad/e2e/v3/cluster3" - "github.com/hashicorp/nomad/e2e/v3/jobs3" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/e2e/v3/cluster3" + "github.com/hashicorp/nomad/v2/e2e/v3/jobs3" + "github.com/hashicorp/nomad/v2/nomad/structs" "github.com/shoenig/test/must" "github.com/shoenig/test/wait" ) diff --git a/e2e/client_identity/client_identity_test.go b/e2e/client_identity/client_identity_test.go index 2ebcf7db2b0..6457476cd7e 100644 --- a/e2e/client_identity/client_identity_test.go +++ b/e2e/client_identity/client_identity_test.go @@ -11,7 +11,7 @@ import ( "time" "github.com/hashicorp/nomad/api" - "github.com/hashicorp/nomad/e2e/e2eutil" + "github.com/hashicorp/nomad/v2/e2e/e2eutil" "github.com/shoenig/test/must" ) diff --git a/e2e/client_intro/client_intro_test.go b/e2e/client_intro/client_intro_test.go index 28ab4fa7757..db1bd7288b1 100644 --- a/e2e/client_intro/client_intro_test.go +++ b/e2e/client_intro/client_intro_test.go @@ -15,9 +15,9 @@ import ( "github.com/hashicorp/go-hclog" "github.com/hashicorp/nomad/api" - "github.com/hashicorp/nomad/e2e/execagent" - "github.com/hashicorp/nomad/helper/discover" - "github.com/hashicorp/nomad/helper/uuid" + "github.com/hashicorp/nomad/v2/e2e/execagent" + "github.com/hashicorp/nomad/v2/helper/discover" + "github.com/hashicorp/nomad/v2/helper/uuid" "github.com/shoenig/test/must" "github.com/shoenig/test/wait" ) diff --git a/e2e/clientstate/allocs_test.go b/e2e/clientstate/allocs_test.go index ff47cf3eb30..2a79fec12f7 100644 --- a/e2e/clientstate/allocs_test.go +++ b/e2e/clientstate/allocs_test.go @@ -7,8 +7,8 @@ import ( "testing" "time" - "github.com/hashicorp/nomad/e2e/e2eutil" - "github.com/hashicorp/nomad/helper/uuid" + "github.com/hashicorp/nomad/v2/e2e/e2eutil" + "github.com/hashicorp/nomad/v2/helper/uuid" "github.com/shoenig/test/must" "github.com/shoenig/test/wait" ) diff --git a/e2e/clientstate/clientstate.go b/e2e/clientstate/clientstate.go index 94d99d14f93..6a8d9e5fce3 100644 --- a/e2e/clientstate/clientstate.go +++ b/e2e/clientstate/clientstate.go @@ -17,15 +17,15 @@ import ( "time" "github.com/hashicorp/nomad/api" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/client/state" - "github.com/hashicorp/nomad/e2e/e2eutil" - "github.com/hashicorp/nomad/e2e/execagent" - "github.com/hashicorp/nomad/e2e/framework" - "github.com/hashicorp/nomad/helper/discover" - "github.com/hashicorp/nomad/helper/testlog" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/testutil" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/client/state" + "github.com/hashicorp/nomad/v2/e2e/e2eutil" + "github.com/hashicorp/nomad/v2/e2e/execagent" + "github.com/hashicorp/nomad/v2/e2e/framework" + "github.com/hashicorp/nomad/v2/helper/discover" + "github.com/hashicorp/nomad/v2/helper/testlog" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/testutil" ) func init() { diff --git a/e2e/cni/cni_test.go b/e2e/cni/cni_test.go index 7f46d127459..a0571ffa255 100644 --- a/e2e/cni/cni_test.go +++ b/e2e/cni/cni_test.go @@ -6,8 +6,8 @@ package cni import ( "testing" - "github.com/hashicorp/nomad/e2e/v3/cluster3" - "github.com/hashicorp/nomad/e2e/v3/jobs3" + "github.com/hashicorp/nomad/v2/e2e/v3/cluster3" + "github.com/hashicorp/nomad/v2/e2e/v3/jobs3" "github.com/shoenig/test/must" ) diff --git a/e2e/connect/client_test.go b/e2e/connect/client_test.go index b9be35e6926..a7231bbf4f2 100644 --- a/e2e/connect/client_test.go +++ b/e2e/connect/client_test.go @@ -7,8 +7,8 @@ import ( "testing" capi "github.com/hashicorp/consul/api" - "github.com/hashicorp/nomad/e2e/e2eutil" - "github.com/hashicorp/nomad/e2e/v3/jobs3" + "github.com/hashicorp/nomad/v2/e2e/e2eutil" + "github.com/hashicorp/nomad/v2/e2e/v3/jobs3" "github.com/shoenig/test" "github.com/shoenig/test/must" ) diff --git a/e2e/connect/connect_test.go b/e2e/connect/connect_test.go index 228f36401d7..24febdc85be 100644 --- a/e2e/connect/connect_test.go +++ b/e2e/connect/connect_test.go @@ -8,8 +8,8 @@ import ( "time" capi "github.com/hashicorp/consul/api" - "github.com/hashicorp/nomad/e2e/e2eutil" - "github.com/hashicorp/nomad/e2e/v3/jobs3" + "github.com/hashicorp/nomad/v2/e2e/e2eutil" + "github.com/hashicorp/nomad/v2/e2e/v3/jobs3" "github.com/shoenig/test" "github.com/shoenig/test/must" ) diff --git a/e2e/consul/alloc_restart_test.go b/e2e/consul/alloc_restart_test.go index 735fa748e11..f1dc785c39b 100644 --- a/e2e/consul/alloc_restart_test.go +++ b/e2e/consul/alloc_restart_test.go @@ -9,8 +9,8 @@ import ( "testing" "time" - "github.com/hashicorp/nomad/e2e/e2eutil" - "github.com/hashicorp/nomad/helper/uuid" + "github.com/hashicorp/nomad/v2/e2e/e2eutil" + "github.com/hashicorp/nomad/v2/helper/uuid" "github.com/shoenig/test/must" "github.com/shoenig/test/wait" ) diff --git a/e2e/consul/check_restart.go b/e2e/consul/check_restart.go index 46176c4d25d..617043bd23e 100644 --- a/e2e/consul/check_restart.go +++ b/e2e/consul/check_restart.go @@ -11,9 +11,9 @@ import ( "strings" "time" - e2e "github.com/hashicorp/nomad/e2e/e2eutil" - "github.com/hashicorp/nomad/e2e/framework" - "github.com/hashicorp/nomad/helper/uuid" + e2e "github.com/hashicorp/nomad/v2/e2e/e2eutil" + "github.com/hashicorp/nomad/v2/e2e/framework" + "github.com/hashicorp/nomad/v2/helper/uuid" ) const ns = "" diff --git a/e2e/consul/consul.go b/e2e/consul/consul.go index 6514a2bf8ba..0fb359f60c6 100644 --- a/e2e/consul/consul.go +++ b/e2e/consul/consul.go @@ -8,12 +8,12 @@ import ( "os" api "github.com/hashicorp/nomad/api" - "github.com/hashicorp/nomad/e2e/e2eutil" - "github.com/hashicorp/nomad/e2e/framework" - "github.com/hashicorp/nomad/helper" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/testutil" + "github.com/hashicorp/nomad/v2/e2e/e2eutil" + "github.com/hashicorp/nomad/v2/e2e/framework" + "github.com/hashicorp/nomad/v2/helper" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/testutil" "github.com/stretchr/testify/require" ) diff --git a/e2e/consul/consul_test.go b/e2e/consul/consul_test.go index 8a1389c0992..1f571faa49b 100644 --- a/e2e/consul/consul_test.go +++ b/e2e/consul/consul_test.go @@ -6,7 +6,7 @@ package consul import ( "testing" - "github.com/hashicorp/nomad/e2e/e2eutil" + "github.com/hashicorp/nomad/v2/e2e/e2eutil" ) func TestConsul(t *testing.T) { diff --git a/e2e/consul/namespaces.go b/e2e/consul/namespaces.go index 76c855d34ae..a9203b4bb4a 100644 --- a/e2e/consul/namespaces.go +++ b/e2e/consul/namespaces.go @@ -9,8 +9,8 @@ import ( "sort" capi "github.com/hashicorp/consul/api" - "github.com/hashicorp/nomad/e2e/e2eutil" - "github.com/hashicorp/nomad/e2e/framework" + "github.com/hashicorp/nomad/v2/e2e/e2eutil" + "github.com/hashicorp/nomad/v2/e2e/framework" "github.com/shoenig/test/must" "github.com/stretchr/testify/require" ) diff --git a/e2e/consul/namespaces_ce.go b/e2e/consul/namespaces_ce.go index cda8a87ebf7..edc4109904d 100644 --- a/e2e/consul/namespaces_ce.go +++ b/e2e/consul/namespaces_ce.go @@ -16,8 +16,8 @@ import ( "sort" capi "github.com/hashicorp/consul/api" - "github.com/hashicorp/nomad/e2e/e2eutil" - "github.com/hashicorp/nomad/e2e/framework" + "github.com/hashicorp/nomad/v2/e2e/e2eutil" + "github.com/hashicorp/nomad/v2/e2e/framework" "github.com/stretchr/testify/require" ) diff --git a/e2e/consul/on_update.go b/e2e/consul/on_update.go index 554e1295b0b..8aa8a73fbd0 100644 --- a/e2e/consul/on_update.go +++ b/e2e/consul/on_update.go @@ -7,10 +7,10 @@ import ( "fmt" "time" - "github.com/hashicorp/nomad/e2e/e2eutil" - "github.com/hashicorp/nomad/e2e/framework" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/testutil" + "github.com/hashicorp/nomad/v2/e2e/e2eutil" + "github.com/hashicorp/nomad/v2/e2e/framework" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/testutil" ) type OnUpdateChecksTest struct { diff --git a/e2e/consul/script_checks.go b/e2e/consul/script_checks.go index 234754e644a..b094b423723 100644 --- a/e2e/consul/script_checks.go +++ b/e2e/consul/script_checks.go @@ -13,9 +13,9 @@ import ( capi "github.com/hashicorp/consul/api" napi "github.com/hashicorp/nomad/api" - "github.com/hashicorp/nomad/e2e/e2eutil" - "github.com/hashicorp/nomad/e2e/framework" - "github.com/hashicorp/nomad/helper/uuid" + "github.com/hashicorp/nomad/v2/e2e/e2eutil" + "github.com/hashicorp/nomad/v2/e2e/framework" + "github.com/hashicorp/nomad/v2/helper/uuid" "github.com/stretchr/testify/require" ) diff --git a/e2e/consul/service_revert_test.go b/e2e/consul/service_revert_test.go index 9f69681aa8c..9c5fc929ce1 100644 --- a/e2e/consul/service_revert_test.go +++ b/e2e/consul/service_revert_test.go @@ -7,9 +7,9 @@ import ( "context" "testing" - "github.com/hashicorp/nomad/e2e/e2eutil" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/e2e/e2eutil" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/nomad/structs" "github.com/shoenig/test/must" ) diff --git a/e2e/consulcompat/consulcompat_test.go b/e2e/consulcompat/consulcompat_test.go index b15d5daf543..71bbfa2bfca 100644 --- a/e2e/consulcompat/consulcompat_test.go +++ b/e2e/consulcompat/consulcompat_test.go @@ -8,7 +8,7 @@ import ( "syscall" "testing" - "github.com/hashicorp/nomad/client/testutil" + "github.com/hashicorp/nomad/v2/client/testutil" ) const ( diff --git a/e2e/consulcompat/run_ce_test.go b/e2e/consulcompat/run_ce_test.go index 9688a7a4593..b5445642c01 100644 --- a/e2e/consulcompat/run_ce_test.go +++ b/e2e/consulcompat/run_ce_test.go @@ -9,7 +9,7 @@ import ( "testing" "github.com/hashicorp/go-version" - "github.com/hashicorp/nomad/testutil" + "github.com/hashicorp/nomad/v2/testutil" ) // usable is used by the downloader to verify that we're getting the right diff --git a/e2e/consulcompat/shared_run_test.go b/e2e/consulcompat/shared_run_test.go index 77a22e88789..280a6fce09f 100644 --- a/e2e/consulcompat/shared_run_test.go +++ b/e2e/consulcompat/shared_run_test.go @@ -16,7 +16,7 @@ import ( "github.com/hashicorp/go-version" "github.com/hashicorp/nomad/api" nomadapi "github.com/hashicorp/nomad/api" - "github.com/hashicorp/nomad/helper/uuid" + "github.com/hashicorp/nomad/v2/helper/uuid" "github.com/shoenig/test/must" "github.com/shoenig/test/wait" ) diff --git a/e2e/consulcompat/shared_setup_test.go b/e2e/consulcompat/shared_setup_test.go index 422d7342841..c92b1984154 100644 --- a/e2e/consulcompat/shared_setup_test.go +++ b/e2e/consulcompat/shared_setup_test.go @@ -12,9 +12,9 @@ import ( consulapi "github.com/hashicorp/consul/api" consulTestUtil "github.com/hashicorp/consul/sdk/testutil" nomadapi "github.com/hashicorp/nomad/api" - "github.com/hashicorp/nomad/helper/testlog" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/testutil" + "github.com/hashicorp/nomad/v2/helper/testlog" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/testutil" "github.com/shoenig/test/must" ) diff --git a/e2e/consultemplate/consultemplate_test.go b/e2e/consultemplate/consultemplate_test.go index b5e7eb9d907..03ceec76a5f 100644 --- a/e2e/consultemplate/consultemplate_test.go +++ b/e2e/consultemplate/consultemplate_test.go @@ -12,11 +12,11 @@ import ( capi "github.com/hashicorp/consul/api" "github.com/hashicorp/nomad/api" - "github.com/hashicorp/nomad/e2e/e2eutil" - "github.com/hashicorp/nomad/e2e/v3/jobs3" - "github.com/hashicorp/nomad/e2e/v3/namespaces3" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/e2e/e2eutil" + "github.com/hashicorp/nomad/v2/e2e/v3/jobs3" + "github.com/hashicorp/nomad/v2/e2e/v3/namespaces3" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/nomad/structs" "github.com/shoenig/test" "github.com/shoenig/test/must" "github.com/shoenig/test/wait" diff --git a/e2e/csi/csi.go b/e2e/csi/csi.go index 2893b1b4fae..88db3b5a73a 100644 --- a/e2e/csi/csi.go +++ b/e2e/csi/csi.go @@ -16,10 +16,10 @@ import ( "time" "github.com/hashicorp/nomad/api" - e2e "github.com/hashicorp/nomad/e2e/e2eutil" - "github.com/hashicorp/nomad/e2e/framework" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/testutil" + e2e "github.com/hashicorp/nomad/v2/e2e/e2eutil" + "github.com/hashicorp/nomad/v2/e2e/framework" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/testutil" ) func init() { diff --git a/e2e/csi/ebs.go b/e2e/csi/ebs.go index 9f7d8fdf518..c96fd85dd13 100644 --- a/e2e/csi/ebs.go +++ b/e2e/csi/ebs.go @@ -9,11 +9,11 @@ import ( "os/exec" "time" - "github.com/hashicorp/nomad/e2e/e2eutil" - e2e "github.com/hashicorp/nomad/e2e/e2eutil" - "github.com/hashicorp/nomad/e2e/framework" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/testutil" + "github.com/hashicorp/nomad/v2/e2e/e2eutil" + e2e "github.com/hashicorp/nomad/v2/e2e/e2eutil" + "github.com/hashicorp/nomad/v2/e2e/framework" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/testutil" ) // CSIControllerPluginEBSTest exercises the AWS EBS plugin, which is an diff --git a/e2e/csi/efs.go b/e2e/csi/efs.go index b35d31ebccf..175b3282357 100644 --- a/e2e/csi/efs.go +++ b/e2e/csi/efs.go @@ -7,9 +7,9 @@ import ( "fmt" "os" - e2e "github.com/hashicorp/nomad/e2e/e2eutil" - "github.com/hashicorp/nomad/e2e/framework" - "github.com/hashicorp/nomad/helper/uuid" + e2e "github.com/hashicorp/nomad/v2/e2e/e2eutil" + "github.com/hashicorp/nomad/v2/e2e/framework" + "github.com/hashicorp/nomad/v2/helper/uuid" "github.com/stretchr/testify/require" ) diff --git a/e2e/deployment/deployment.go b/e2e/deployment/deployment.go index 7faaeb5efef..badff6a0f5a 100644 --- a/e2e/deployment/deployment.go +++ b/e2e/deployment/deployment.go @@ -6,13 +6,13 @@ package deployment import ( "fmt" - "github.com/hashicorp/nomad/e2e/framework" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/testutil" + "github.com/hashicorp/nomad/v2/e2e/framework" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/testutil" "github.com/stretchr/testify/require" - "github.com/hashicorp/nomad/e2e/e2eutil" - "github.com/hashicorp/nomad/helper/uuid" + "github.com/hashicorp/nomad/v2/e2e/e2eutil" + "github.com/hashicorp/nomad/v2/helper/uuid" ) type DeploymentTest struct { diff --git a/e2e/disconnectedclients/disconnectedclients_test.go b/e2e/disconnectedclients/disconnectedclients_test.go index ddd172cdad0..1d5fabf055d 100644 --- a/e2e/disconnectedclients/disconnectedclients_test.go +++ b/e2e/disconnectedclients/disconnectedclients_test.go @@ -9,9 +9,9 @@ import ( "time" "github.com/hashicorp/go-multierror" - "github.com/hashicorp/nomad/e2e/e2eutil" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/testutil" + "github.com/hashicorp/nomad/v2/e2e/e2eutil" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/testutil" "github.com/shoenig/test/must" "github.com/stretchr/testify/require" ) diff --git a/e2e/docker/docker_test.go b/e2e/docker/docker_test.go index 1fecb27515e..54843821bbc 100644 --- a/e2e/docker/docker_test.go +++ b/e2e/docker/docker_test.go @@ -9,9 +9,9 @@ import ( "testing" "time" - "github.com/hashicorp/nomad/e2e/e2eutil" - "github.com/hashicorp/nomad/e2e/v3/cluster3" - "github.com/hashicorp/nomad/e2e/v3/jobs3" + "github.com/hashicorp/nomad/v2/e2e/e2eutil" + "github.com/hashicorp/nomad/v2/e2e/v3/cluster3" + "github.com/hashicorp/nomad/v2/e2e/v3/jobs3" "github.com/shoenig/test/must" ) diff --git a/e2e/dynamic_host_volumes/dynamic_host_volumes_test.go b/e2e/dynamic_host_volumes/dynamic_host_volumes_test.go index eb4192bbdff..0524e06a6c4 100644 --- a/e2e/dynamic_host_volumes/dynamic_host_volumes_test.go +++ b/e2e/dynamic_host_volumes/dynamic_host_volumes_test.go @@ -11,9 +11,9 @@ import ( "github.com/hashicorp/nomad/api" nomadapi "github.com/hashicorp/nomad/api" - "github.com/hashicorp/nomad/e2e/e2eutil" - "github.com/hashicorp/nomad/e2e/v3/jobs3" - "github.com/hashicorp/nomad/e2e/v3/volumes3" + "github.com/hashicorp/nomad/v2/e2e/e2eutil" + "github.com/hashicorp/nomad/v2/e2e/v3/jobs3" + "github.com/hashicorp/nomad/v2/e2e/v3/volumes3" "github.com/shoenig/test" "github.com/shoenig/test/must" "github.com/shoenig/test/wait" diff --git a/e2e/e2e_test.go b/e2e/e2e_test.go index 61cb37ee822..295743a0f48 100644 --- a/e2e/e2e_test.go +++ b/e2e/e2e_test.go @@ -9,45 +9,45 @@ import ( "os" "testing" - "github.com/hashicorp/nomad/e2e/framework" + "github.com/hashicorp/nomad/v2/e2e/framework" - _ "github.com/hashicorp/nomad/e2e/affinities" - _ "github.com/hashicorp/nomad/e2e/clientstate" - _ "github.com/hashicorp/nomad/e2e/consul" - _ "github.com/hashicorp/nomad/e2e/csi" - _ "github.com/hashicorp/nomad/e2e/deployment" - _ "github.com/hashicorp/nomad/e2e/eval_priority" - _ "github.com/hashicorp/nomad/e2e/events" - _ "github.com/hashicorp/nomad/e2e/lifecycle" - _ "github.com/hashicorp/nomad/e2e/networking" - _ "github.com/hashicorp/nomad/e2e/parameterized" - _ "github.com/hashicorp/nomad/e2e/periodic" - _ "github.com/hashicorp/nomad/e2e/quotas" - _ "github.com/hashicorp/nomad/e2e/scalingpolicies" - _ "github.com/hashicorp/nomad/e2e/scheduler_sysbatch" - _ "github.com/hashicorp/nomad/e2e/taskevents" + _ "github.com/hashicorp/nomad/v2/e2e/affinities" + _ "github.com/hashicorp/nomad/v2/e2e/clientstate" + _ "github.com/hashicorp/nomad/v2/e2e/consul" + _ "github.com/hashicorp/nomad/v2/e2e/csi" + _ "github.com/hashicorp/nomad/v2/e2e/deployment" + _ "github.com/hashicorp/nomad/v2/e2e/eval_priority" + _ "github.com/hashicorp/nomad/v2/e2e/events" + _ "github.com/hashicorp/nomad/v2/e2e/lifecycle" + _ "github.com/hashicorp/nomad/v2/e2e/networking" + _ "github.com/hashicorp/nomad/v2/e2e/parameterized" + _ "github.com/hashicorp/nomad/v2/e2e/periodic" + _ "github.com/hashicorp/nomad/v2/e2e/quotas" + _ "github.com/hashicorp/nomad/v2/e2e/scalingpolicies" + _ "github.com/hashicorp/nomad/v2/e2e/scheduler_sysbatch" + _ "github.com/hashicorp/nomad/v2/e2e/taskevents" // these are no longer on the old framework but by importing them // we get a quick check that they compile on every commit - _ "github.com/hashicorp/nomad/e2e/connect" - _ "github.com/hashicorp/nomad/e2e/consultemplate" - _ "github.com/hashicorp/nomad/e2e/disconnectedclients" - _ "github.com/hashicorp/nomad/e2e/docker" - _ "github.com/hashicorp/nomad/e2e/dynamic_host_volumes" - _ "github.com/hashicorp/nomad/e2e/isolation" - _ "github.com/hashicorp/nomad/e2e/metrics" - _ "github.com/hashicorp/nomad/e2e/namespaces" - _ "github.com/hashicorp/nomad/e2e/nodedrain" - _ "github.com/hashicorp/nomad/e2e/nomadexec" - _ "github.com/hashicorp/nomad/e2e/oversubscription" - _ "github.com/hashicorp/nomad/e2e/podman" - _ "github.com/hashicorp/nomad/e2e/rescheduling" - _ "github.com/hashicorp/nomad/e2e/scaling" - _ "github.com/hashicorp/nomad/e2e/scheduler_system" - _ "github.com/hashicorp/nomad/e2e/secret" - _ "github.com/hashicorp/nomad/e2e/spread" - _ "github.com/hashicorp/nomad/e2e/vaultsecrets" - _ "github.com/hashicorp/nomad/e2e/volume_mounts" + _ "github.com/hashicorp/nomad/v2/e2e/connect" + _ "github.com/hashicorp/nomad/v2/e2e/consultemplate" + _ "github.com/hashicorp/nomad/v2/e2e/disconnectedclients" + _ "github.com/hashicorp/nomad/v2/e2e/docker" + _ "github.com/hashicorp/nomad/v2/e2e/dynamic_host_volumes" + _ "github.com/hashicorp/nomad/v2/e2e/isolation" + _ "github.com/hashicorp/nomad/v2/e2e/metrics" + _ "github.com/hashicorp/nomad/v2/e2e/namespaces" + _ "github.com/hashicorp/nomad/v2/e2e/nodedrain" + _ "github.com/hashicorp/nomad/v2/e2e/nomadexec" + _ "github.com/hashicorp/nomad/v2/e2e/oversubscription" + _ "github.com/hashicorp/nomad/v2/e2e/podman" + _ "github.com/hashicorp/nomad/v2/e2e/rescheduling" + _ "github.com/hashicorp/nomad/v2/e2e/scaling" + _ "github.com/hashicorp/nomad/v2/e2e/scheduler_system" + _ "github.com/hashicorp/nomad/v2/e2e/secret" + _ "github.com/hashicorp/nomad/v2/e2e/spread" + _ "github.com/hashicorp/nomad/v2/e2e/vaultsecrets" + _ "github.com/hashicorp/nomad/v2/e2e/volume_mounts" ) func TestE2E(t *testing.T) { diff --git a/e2e/e2eutil/acl.go b/e2e/e2eutil/acl.go index e22a16ebdfa..8e3d607030c 100644 --- a/e2e/e2eutil/acl.go +++ b/e2e/e2eutil/acl.go @@ -9,7 +9,7 @@ import ( "testing" "github.com/hashicorp/nomad/api" - "github.com/hashicorp/nomad/helper/uuid" + "github.com/hashicorp/nomad/v2/helper/uuid" "github.com/shoenig/test" "github.com/shoenig/test/must" ) diff --git a/e2e/e2eutil/allocs.go b/e2e/e2eutil/allocs.go index 5fe33cc0274..4621e14dd24 100644 --- a/e2e/e2eutil/allocs.go +++ b/e2e/e2eutil/allocs.go @@ -13,7 +13,7 @@ import ( "time" api "github.com/hashicorp/nomad/api" - "github.com/hashicorp/nomad/testutil" + "github.com/hashicorp/nomad/v2/testutil" "github.com/kr/pretty" "github.com/shoenig/test/must" "github.com/shoenig/test/wait" diff --git a/e2e/e2eutil/cli.go b/e2e/e2eutil/cli.go index 31a22bf0940..2ac470589a3 100644 --- a/e2e/e2eutil/cli.go +++ b/e2e/e2eutil/cli.go @@ -13,7 +13,7 @@ import ( "testing" "time" - "github.com/hashicorp/nomad/e2e/v3/util3" + "github.com/hashicorp/nomad/v2/e2e/v3/util3" "github.com/shoenig/test" "github.com/shoenig/test/must" diff --git a/e2e/e2eutil/client.go b/e2e/e2eutil/client.go index 146ddf2f351..7e45cb926dd 100644 --- a/e2e/e2eutil/client.go +++ b/e2e/e2eutil/client.go @@ -8,7 +8,7 @@ import ( capi "github.com/hashicorp/consul/api" napi "github.com/hashicorp/nomad/api" - "github.com/hashicorp/nomad/helper/useragent" + "github.com/hashicorp/nomad/v2/helper/useragent" vapi "github.com/hashicorp/vault/api" "github.com/shoenig/test/must" ) diff --git a/e2e/e2eutil/consul.go b/e2e/e2eutil/consul.go index f929e3f734a..03cd90afc3e 100644 --- a/e2e/e2eutil/consul.go +++ b/e2e/e2eutil/consul.go @@ -9,7 +9,7 @@ import ( "time" capi "github.com/hashicorp/consul/api" - "github.com/hashicorp/nomad/testutil" + "github.com/hashicorp/nomad/v2/testutil" "github.com/kr/pretty" "github.com/shoenig/test/must" "github.com/stretchr/testify/assert" diff --git a/e2e/e2eutil/deployments.go b/e2e/e2eutil/deployments.go index 5050a22d45c..2edb580aaf2 100644 --- a/e2e/e2eutil/deployments.go +++ b/e2e/e2eutil/deployments.go @@ -7,7 +7,7 @@ import ( "fmt" "time" - "github.com/hashicorp/nomad/testutil" + "github.com/hashicorp/nomad/v2/testutil" ) func WaitForLastDeploymentStatus(jobID, ns, status string, wc *WaitConfig) error { diff --git a/e2e/e2eutil/e2ejob.go b/e2e/e2eutil/e2ejob.go index 0b5d140ed97..26dc0a5c2c2 100644 --- a/e2e/e2eutil/e2ejob.go +++ b/e2e/e2eutil/e2ejob.go @@ -16,11 +16,11 @@ import ( "time" api "github.com/hashicorp/nomad/api" - "github.com/hashicorp/nomad/e2e/framework" - "github.com/hashicorp/nomad/helper/discover" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/testutil" + "github.com/hashicorp/nomad/v2/e2e/framework" + "github.com/hashicorp/nomad/v2/helper/discover" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/testutil" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/e2e/e2eutil/node.go b/e2e/e2eutil/node.go index 3fa33c6364c..023df2f5b66 100644 --- a/e2e/e2eutil/node.go +++ b/e2e/e2eutil/node.go @@ -10,7 +10,7 @@ import ( "time" "github.com/hashicorp/nomad/api" - "github.com/hashicorp/nomad/testutil" + "github.com/hashicorp/nomad/v2/testutil" ) // AgentDisconnect is a test helper function that runs a raw_exec job diff --git a/e2e/e2eutil/utils.go b/e2e/e2eutil/utils.go index 5220958e0a2..4f9e6879045 100644 --- a/e2e/e2eutil/utils.go +++ b/e2e/e2eutil/utils.go @@ -12,9 +12,9 @@ import ( "time" api "github.com/hashicorp/nomad/api" - "github.com/hashicorp/nomad/jobspec2" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/testutil" + "github.com/hashicorp/nomad/v2/jobspec2" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/testutil" "github.com/kr/pretty" "github.com/stretchr/testify/require" ) diff --git a/e2e/eval_priority/eval_priority.go b/e2e/eval_priority/eval_priority.go index 4430cdf4f14..2841d7c8a06 100644 --- a/e2e/eval_priority/eval_priority.go +++ b/e2e/eval_priority/eval_priority.go @@ -5,9 +5,9 @@ package eval_priority import ( "github.com/hashicorp/nomad/api" - "github.com/hashicorp/nomad/e2e/e2eutil" - "github.com/hashicorp/nomad/e2e/framework" - "github.com/hashicorp/nomad/helper/uuid" + "github.com/hashicorp/nomad/v2/e2e/e2eutil" + "github.com/hashicorp/nomad/v2/e2e/framework" + "github.com/hashicorp/nomad/v2/helper/uuid" ) type EvalPriorityTest struct { diff --git a/e2e/events/events.go b/e2e/events/events.go index bfd37856267..a4794b49913 100644 --- a/e2e/events/events.go +++ b/e2e/events/events.go @@ -9,11 +9,11 @@ import ( "time" "github.com/hashicorp/nomad/api" - "github.com/hashicorp/nomad/e2e/e2eutil" - "github.com/hashicorp/nomad/e2e/framework" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/testutil" + "github.com/hashicorp/nomad/v2/e2e/e2eutil" + "github.com/hashicorp/nomad/v2/e2e/framework" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/testutil" "github.com/stretchr/testify/require" ) diff --git a/e2e/example/example_test.go b/e2e/example/example_test.go index 86246e6e73b..a221d1b27c0 100644 --- a/e2e/example/example_test.go +++ b/e2e/example/example_test.go @@ -8,10 +8,10 @@ import ( "testing" "time" - "github.com/hashicorp/nomad/e2e/v3/cluster3" - "github.com/hashicorp/nomad/e2e/v3/jobs3" - "github.com/hashicorp/nomad/e2e/v3/namespaces3" - "github.com/hashicorp/nomad/e2e/v3/util3" + "github.com/hashicorp/nomad/v2/e2e/v3/cluster3" + "github.com/hashicorp/nomad/v2/e2e/v3/jobs3" + "github.com/hashicorp/nomad/v2/e2e/v3/namespaces3" + "github.com/hashicorp/nomad/v2/e2e/v3/util3" "github.com/shoenig/test/must" ) diff --git a/e2e/exec2/exec2_test.go b/e2e/exec2/exec2_test.go index 36dcf66d7fc..93f6d4daadb 100644 --- a/e2e/exec2/exec2_test.go +++ b/e2e/exec2/exec2_test.go @@ -8,8 +8,8 @@ import ( "regexp" "testing" - "github.com/hashicorp/nomad/e2e/v3/cluster3" - "github.com/hashicorp/nomad/e2e/v3/jobs3" + "github.com/hashicorp/nomad/v2/e2e/v3/cluster3" + "github.com/hashicorp/nomad/v2/e2e/v3/jobs3" "github.com/shoenig/test/must" ) diff --git a/e2e/framework/context.go b/e2e/framework/context.go index 98dfb424798..18652d25705 100644 --- a/e2e/framework/context.go +++ b/e2e/framework/context.go @@ -6,7 +6,7 @@ package framework import ( "testing" - "github.com/hashicorp/nomad/helper/uuid" + "github.com/hashicorp/nomad/v2/helper/uuid" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/e2e/framework/framework.go b/e2e/framework/framework.go index adf6fd9fcc9..31b1509da12 100644 --- a/e2e/framework/framework.go +++ b/e2e/framework/framework.go @@ -11,7 +11,7 @@ import ( "strings" "testing" - "github.com/hashicorp/nomad/ci" + "github.com/hashicorp/nomad/v2/ci" "github.com/stretchr/testify/require" ) diff --git a/e2e/framework/provisioner.go b/e2e/framework/provisioner.go index 3b0b3d80080..d0e4ef7797d 100644 --- a/e2e/framework/provisioner.go +++ b/e2e/framework/provisioner.go @@ -10,8 +10,8 @@ import ( capi "github.com/hashicorp/consul/api" napi "github.com/hashicorp/nomad/api" - "github.com/hashicorp/nomad/helper/useragent" - "github.com/hashicorp/nomad/helper/uuid" + "github.com/hashicorp/nomad/v2/helper/useragent" + "github.com/hashicorp/nomad/v2/helper/uuid" vapi "github.com/hashicorp/vault/api" ) diff --git a/e2e/isolation/chroot_test.go b/e2e/isolation/chroot_test.go index 0e628e5460e..a91e0c05317 100644 --- a/e2e/isolation/chroot_test.go +++ b/e2e/isolation/chroot_test.go @@ -7,8 +7,8 @@ import ( "regexp" "testing" - "github.com/hashicorp/nomad/e2e/e2eutil" - "github.com/hashicorp/nomad/helper/uuid" + "github.com/hashicorp/nomad/v2/e2e/e2eutil" + "github.com/hashicorp/nomad/v2/helper/uuid" "github.com/shoenig/test/must" ) diff --git a/e2e/isolation/devices_test.go b/e2e/isolation/devices_test.go index cfdb9905863..7c6a1654f7a 100644 --- a/e2e/isolation/devices_test.go +++ b/e2e/isolation/devices_test.go @@ -6,8 +6,8 @@ package isolation import ( "testing" - "github.com/hashicorp/nomad/e2e/e2eutil" - "github.com/hashicorp/nomad/helper/uuid" + "github.com/hashicorp/nomad/v2/e2e/e2eutil" + "github.com/hashicorp/nomad/v2/helper/uuid" "github.com/shoenig/test/must" ) diff --git a/e2e/isolation/pids_test.go b/e2e/isolation/pids_test.go index 52d786f60ec..c9de743c379 100644 --- a/e2e/isolation/pids_test.go +++ b/e2e/isolation/pids_test.go @@ -9,8 +9,8 @@ import ( "testing" "time" - "github.com/hashicorp/nomad/e2e/v3/cluster3" - "github.com/hashicorp/nomad/e2e/v3/jobs3" + "github.com/hashicorp/nomad/v2/e2e/v3/cluster3" + "github.com/hashicorp/nomad/v2/e2e/v3/jobs3" "github.com/shoenig/test/must" ) diff --git a/e2e/jobsubmissions/jobsubapi_test.go b/e2e/jobsubmissions/jobsubapi_test.go index 8d38a1e21e7..552b3104526 100644 --- a/e2e/jobsubmissions/jobsubapi_test.go +++ b/e2e/jobsubmissions/jobsubapi_test.go @@ -11,9 +11,9 @@ import ( "testing" "github.com/hashicorp/nomad/api" - "github.com/hashicorp/nomad/e2e/acl" - "github.com/hashicorp/nomad/e2e/e2eutil" - "github.com/hashicorp/nomad/helper/uuid" + "github.com/hashicorp/nomad/v2/e2e/acl" + "github.com/hashicorp/nomad/v2/e2e/e2eutil" + "github.com/hashicorp/nomad/v2/helper/uuid" "github.com/shoenig/test/must" ) diff --git a/e2e/keyring/keyring_test.go b/e2e/keyring/keyring_test.go index 612d79519e7..320f95ecb72 100644 --- a/e2e/keyring/keyring_test.go +++ b/e2e/keyring/keyring_test.go @@ -9,7 +9,7 @@ import ( "github.com/go-jose/go-jose/v3" "github.com/hashicorp/nomad/api" - "github.com/hashicorp/nomad/e2e/e2eutil" + "github.com/hashicorp/nomad/v2/e2e/e2eutil" "github.com/shoenig/test/must" ) diff --git a/e2e/lifecycle/lifecycle.go b/e2e/lifecycle/lifecycle.go index 85ce2186cc2..8efe9fcfcc9 100644 --- a/e2e/lifecycle/lifecycle.go +++ b/e2e/lifecycle/lifecycle.go @@ -7,11 +7,11 @@ import ( "fmt" "github.com/hashicorp/nomad/api" - "github.com/hashicorp/nomad/e2e/e2eutil" - "github.com/hashicorp/nomad/e2e/framework" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/testutil" + "github.com/hashicorp/nomad/v2/e2e/e2eutil" + "github.com/hashicorp/nomad/v2/e2e/framework" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/testutil" "github.com/stretchr/testify/require" ) diff --git a/e2e/metrics/metrics_test.go b/e2e/metrics/metrics_test.go index 7c18aede244..439b9c5a432 100644 --- a/e2e/metrics/metrics_test.go +++ b/e2e/metrics/metrics_test.go @@ -10,9 +10,9 @@ import ( "time" nomadapi "github.com/hashicorp/nomad/api" - "github.com/hashicorp/nomad/e2e/e2eutil" - "github.com/hashicorp/nomad/e2e/v3/cluster3" - "github.com/hashicorp/nomad/e2e/v3/jobs3" + "github.com/hashicorp/nomad/v2/e2e/e2eutil" + "github.com/hashicorp/nomad/v2/e2e/v3/cluster3" + "github.com/hashicorp/nomad/v2/e2e/v3/jobs3" promapi "github.com/prometheus/client_golang/api" promapi1 "github.com/prometheus/client_golang/api/prometheus/v1" promodel "github.com/prometheus/common/model" diff --git a/e2e/namespaces/namespaces_test.go b/e2e/namespaces/namespaces_test.go index 6b86e956715..e80bdf9b902 100644 --- a/e2e/namespaces/namespaces_test.go +++ b/e2e/namespaces/namespaces_test.go @@ -12,8 +12,8 @@ import ( "github.com/shoenig/test/must" "github.com/stretchr/testify/require" - "github.com/hashicorp/nomad/e2e/e2eutil" - "github.com/hashicorp/nomad/helper/uuid" + "github.com/hashicorp/nomad/v2/e2e/e2eutil" + "github.com/hashicorp/nomad/v2/helper/uuid" ) // TestNamespacesFiltering exercises the -namespace flag on various commands to diff --git a/e2e/networking/networking.go b/e2e/networking/networking.go index 4da2b707601..5f4b2174775 100644 --- a/e2e/networking/networking.go +++ b/e2e/networking/networking.go @@ -7,9 +7,9 @@ import ( "os" "strings" - "github.com/hashicorp/nomad/e2e/e2eutil" - "github.com/hashicorp/nomad/e2e/framework" - "github.com/hashicorp/nomad/helper/uuid" + "github.com/hashicorp/nomad/v2/e2e/e2eutil" + "github.com/hashicorp/nomad/v2/e2e/framework" + "github.com/hashicorp/nomad/v2/helper/uuid" ) type NetworkingE2ETest struct { diff --git a/e2e/nodedrain/node_drain_test.go b/e2e/nodedrain/node_drain_test.go index 8c1c1a5ee98..da982eae528 100644 --- a/e2e/nodedrain/node_drain_test.go +++ b/e2e/nodedrain/node_drain_test.go @@ -16,9 +16,9 @@ import ( "github.com/shoenig/test/wait" "github.com/hashicorp/nomad/api" - "github.com/hashicorp/nomad/e2e/e2eutil" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/e2e/e2eutil" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/nomad/structs" ) func TestNodeDrain(t *testing.T) { diff --git a/e2e/nomadexec/exec_test.go b/e2e/nomadexec/exec_test.go index 5f7a7cbaf17..ae840633413 100644 --- a/e2e/nomadexec/exec_test.go +++ b/e2e/nomadexec/exec_test.go @@ -12,10 +12,10 @@ import ( "time" "github.com/hashicorp/nomad/api" - "github.com/hashicorp/nomad/e2e/e2eutil" - "github.com/hashicorp/nomad/e2e/v3/cluster3" - "github.com/hashicorp/nomad/e2e/v3/jobs3" - dtestutils "github.com/hashicorp/nomad/plugins/drivers/testutils" + "github.com/hashicorp/nomad/v2/e2e/e2eutil" + "github.com/hashicorp/nomad/v2/e2e/v3/cluster3" + "github.com/hashicorp/nomad/v2/e2e/v3/jobs3" + dtestutils "github.com/hashicorp/nomad/v2/plugins/drivers/testutils" "github.com/shoenig/test/must" ) diff --git a/e2e/operator_scheduler/operator_scheduler_test.go b/e2e/operator_scheduler/operator_scheduler_test.go index 3e472a371f3..cd4b60c0700 100644 --- a/e2e/operator_scheduler/operator_scheduler_test.go +++ b/e2e/operator_scheduler/operator_scheduler_test.go @@ -9,8 +9,8 @@ import ( "testing" "time" - "github.com/hashicorp/nomad/e2e/e2eutil" - "github.com/hashicorp/nomad/helper/uuid" + "github.com/hashicorp/nomad/v2/e2e/e2eutil" + "github.com/hashicorp/nomad/v2/helper/uuid" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/e2e/overlap/overlap_test.go b/e2e/overlap/overlap_test.go index c79124adc9f..7827e7f8203 100644 --- a/e2e/overlap/overlap_test.go +++ b/e2e/overlap/overlap_test.go @@ -9,9 +9,9 @@ import ( "time" "github.com/hashicorp/nomad/api" - "github.com/hashicorp/nomad/e2e/e2eutil" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/testutil" + "github.com/hashicorp/nomad/v2/e2e/e2eutil" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/testutil" "github.com/shoenig/test/must" ) diff --git a/e2e/oversubscription/oversubscription_test.go b/e2e/oversubscription/oversubscription_test.go index 25b07f6e65b..79cb3109c3e 100644 --- a/e2e/oversubscription/oversubscription_test.go +++ b/e2e/oversubscription/oversubscription_test.go @@ -11,9 +11,9 @@ import ( "time" "github.com/hashicorp/nomad/api" - "github.com/hashicorp/nomad/e2e/e2eutil" - "github.com/hashicorp/nomad/e2e/v3/cluster3" - "github.com/hashicorp/nomad/e2e/v3/jobs3" + "github.com/hashicorp/nomad/v2/e2e/e2eutil" + "github.com/hashicorp/nomad/v2/e2e/v3/cluster3" + "github.com/hashicorp/nomad/v2/e2e/v3/jobs3" "github.com/shoenig/test/must" "github.com/shoenig/test/wait" ) diff --git a/e2e/parameterized/parameterized.go b/e2e/parameterized/parameterized.go index c1ae4f71b0e..42fa4d1fb18 100644 --- a/e2e/parameterized/parameterized.go +++ b/e2e/parameterized/parameterized.go @@ -6,10 +6,10 @@ package parameterized import ( "fmt" - "github.com/hashicorp/nomad/e2e/e2eutil" - "github.com/hashicorp/nomad/e2e/framework" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/testutil" + "github.com/hashicorp/nomad/v2/e2e/e2eutil" + "github.com/hashicorp/nomad/v2/e2e/framework" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/testutil" "github.com/stretchr/testify/require" ) diff --git a/e2e/periodic/periodic_test.go b/e2e/periodic/periodic_test.go index 014692e1b9c..4e0294f3520 100644 --- a/e2e/periodic/periodic_test.go +++ b/e2e/periodic/periodic_test.go @@ -8,8 +8,8 @@ import ( "testing" "time" - "github.com/hashicorp/nomad/e2e/e2eutil" - "github.com/hashicorp/nomad/e2e/v3/jobs3" + "github.com/hashicorp/nomad/v2/e2e/e2eutil" + "github.com/hashicorp/nomad/v2/e2e/v3/jobs3" "github.com/shoenig/test/must" "github.com/shoenig/test/wait" ) diff --git a/e2e/pledge/pledge_test.go b/e2e/pledge/pledge_test.go index 3ccdc4a118f..0b5832ebe01 100644 --- a/e2e/pledge/pledge_test.go +++ b/e2e/pledge/pledge_test.go @@ -8,9 +8,9 @@ import ( "testing" "time" - "github.com/hashicorp/nomad/e2e/e2eutil" - "github.com/hashicorp/nomad/e2e/v3/cluster3" - "github.com/hashicorp/nomad/e2e/v3/jobs3" + "github.com/hashicorp/nomad/v2/e2e/e2eutil" + "github.com/hashicorp/nomad/v2/e2e/v3/cluster3" + "github.com/hashicorp/nomad/v2/e2e/v3/jobs3" "github.com/shoenig/test/must" ) diff --git a/e2e/podman/podman_test.go b/e2e/podman/podman_test.go index d788b455bea..3bfc11c8fa0 100644 --- a/e2e/podman/podman_test.go +++ b/e2e/podman/podman_test.go @@ -9,9 +9,9 @@ import ( "testing" "time" - "github.com/hashicorp/nomad/e2e/e2eutil" - "github.com/hashicorp/nomad/e2e/v3/cluster3" - "github.com/hashicorp/nomad/e2e/v3/jobs3" + "github.com/hashicorp/nomad/v2/e2e/e2eutil" + "github.com/hashicorp/nomad/v2/e2e/v3/cluster3" + "github.com/hashicorp/nomad/v2/e2e/v3/jobs3" "github.com/shoenig/test/must" ) diff --git a/e2e/rawexec/rawexec_test.go b/e2e/rawexec/rawexec_test.go index db895083e4d..679629b8f36 100644 --- a/e2e/rawexec/rawexec_test.go +++ b/e2e/rawexec/rawexec_test.go @@ -6,8 +6,8 @@ package rawexec import ( "testing" - "github.com/hashicorp/nomad/e2e/v3/cluster3" - "github.com/hashicorp/nomad/e2e/v3/jobs3" + "github.com/hashicorp/nomad/v2/e2e/v3/cluster3" + "github.com/hashicorp/nomad/v2/e2e/v3/jobs3" "github.com/shoenig/test/must" ) diff --git a/e2e/rescheduling/rescheduling_test.go b/e2e/rescheduling/rescheduling_test.go index fe2bf2bd6d4..5837014e395 100644 --- a/e2e/rescheduling/rescheduling_test.go +++ b/e2e/rescheduling/rescheduling_test.go @@ -10,8 +10,8 @@ import ( "testing" "time" - "github.com/hashicorp/nomad/e2e/e2eutil" - "github.com/hashicorp/nomad/helper/uuid" + "github.com/hashicorp/nomad/v2/e2e/e2eutil" + "github.com/hashicorp/nomad/v2/helper/uuid" "github.com/shoenig/test" "github.com/shoenig/test/must" "github.com/shoenig/test/wait" diff --git a/e2e/scaling/scaling_test.go b/e2e/scaling/scaling_test.go index f79c4605867..6566429cfcd 100644 --- a/e2e/scaling/scaling_test.go +++ b/e2e/scaling/scaling_test.go @@ -8,10 +8,10 @@ import ( "time" "github.com/hashicorp/nomad/api" - "github.com/hashicorp/nomad/e2e/e2eutil" - "github.com/hashicorp/nomad/e2e/v3/cluster3" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/e2e/e2eutil" + "github.com/hashicorp/nomad/v2/e2e/v3/cluster3" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/nomad/structs" "github.com/shoenig/test/must" "github.com/shoenig/test/wait" ) diff --git a/e2e/scalingpolicies/scalingpolicies.go b/e2e/scalingpolicies/scalingpolicies.go index 2d8dc0a719d..e70950f58c9 100644 --- a/e2e/scalingpolicies/scalingpolicies.go +++ b/e2e/scalingpolicies/scalingpolicies.go @@ -7,9 +7,9 @@ import ( "os" "github.com/hashicorp/nomad/api" - "github.com/hashicorp/nomad/e2e/e2eutil" - "github.com/hashicorp/nomad/e2e/framework" - "github.com/hashicorp/nomad/helper/uuid" + "github.com/hashicorp/nomad/v2/e2e/e2eutil" + "github.com/hashicorp/nomad/v2/e2e/framework" + "github.com/hashicorp/nomad/v2/helper/uuid" "github.com/stretchr/testify/require" ) diff --git a/e2e/scheduler_sysbatch/sysbatch.go b/e2e/scheduler_sysbatch/sysbatch.go index bc16c4e93da..5fc5544f116 100644 --- a/e2e/scheduler_sysbatch/sysbatch.go +++ b/e2e/scheduler_sysbatch/sysbatch.go @@ -8,9 +8,9 @@ import ( "time" "github.com/hashicorp/nomad/api" - "github.com/hashicorp/nomad/e2e/e2eutil" - "github.com/hashicorp/nomad/e2e/framework" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/e2e/e2eutil" + "github.com/hashicorp/nomad/v2/e2e/framework" + "github.com/hashicorp/nomad/v2/nomad/structs" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/e2e/scheduler_system/systemsched_test.go b/e2e/scheduler_system/systemsched_test.go index e30b3d36fa9..0f41c3b9ba8 100644 --- a/e2e/scheduler_system/systemsched_test.go +++ b/e2e/scheduler_system/systemsched_test.go @@ -9,9 +9,9 @@ import ( "time" "github.com/hashicorp/nomad/api" - "github.com/hashicorp/nomad/e2e/v3/cluster3" - "github.com/hashicorp/nomad/e2e/v3/jobs3" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/e2e/v3/cluster3" + "github.com/hashicorp/nomad/v2/e2e/v3/jobs3" + "github.com/hashicorp/nomad/v2/nomad/structs" "github.com/shoenig/test/must" ) diff --git a/e2e/secret/secret_test.go b/e2e/secret/secret_test.go index 93a13dec011..b191d3d2265 100644 --- a/e2e/secret/secret_test.go +++ b/e2e/secret/secret_test.go @@ -10,9 +10,9 @@ import ( "testing" "github.com/hashicorp/nomad/api" - e2e "github.com/hashicorp/nomad/e2e/e2eutil" - "github.com/hashicorp/nomad/e2e/v3/jobs3" - "github.com/hashicorp/nomad/helper/uuid" + e2e "github.com/hashicorp/nomad/v2/e2e/e2eutil" + "github.com/hashicorp/nomad/v2/e2e/v3/jobs3" + "github.com/hashicorp/nomad/v2/helper/uuid" "github.com/shoenig/test/must" ) diff --git a/e2e/servicediscovery/nomad_checks_test.go b/e2e/servicediscovery/nomad_checks_test.go index a6c9614cc67..33441d91446 100644 --- a/e2e/servicediscovery/nomad_checks_test.go +++ b/e2e/servicediscovery/nomad_checks_test.go @@ -10,10 +10,10 @@ import ( "testing" "time" - "github.com/hashicorp/nomad/e2e/e2eutil" - "github.com/hashicorp/nomad/e2e/v3/jobs3" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/e2e/e2eutil" + "github.com/hashicorp/nomad/v2/e2e/v3/jobs3" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/nomad/structs" "github.com/shoenig/test/must" "github.com/shoenig/test/wait" "github.com/stretchr/testify/require" diff --git a/e2e/servicediscovery/service_discovery_test.go b/e2e/servicediscovery/service_discovery_test.go index 6c0530a291b..3ebbc191684 100644 --- a/e2e/servicediscovery/service_discovery_test.go +++ b/e2e/servicediscovery/service_discovery_test.go @@ -12,8 +12,8 @@ import ( "time" "github.com/hashicorp/nomad/api" - "github.com/hashicorp/nomad/e2e/e2eutil" - "github.com/hashicorp/nomad/helper/uuid" + "github.com/hashicorp/nomad/v2/e2e/e2eutil" + "github.com/hashicorp/nomad/v2/helper/uuid" "github.com/stretchr/testify/require" ) diff --git a/e2e/servicediscovery/simple_lb_test.go b/e2e/servicediscovery/simple_lb_test.go index 04789db0f76..89b6b01d831 100644 --- a/e2e/servicediscovery/simple_lb_test.go +++ b/e2e/servicediscovery/simple_lb_test.go @@ -10,8 +10,8 @@ import ( "testing" "github.com/hashicorp/nomad/api" - "github.com/hashicorp/nomad/e2e/e2eutil" - "github.com/hashicorp/nomad/helper/uuid" + "github.com/hashicorp/nomad/v2/e2e/e2eutil" + "github.com/hashicorp/nomad/v2/helper/uuid" "github.com/shoenig/test/must" ) diff --git a/e2e/spread/spread_test.go b/e2e/spread/spread_test.go index 433eccb3a99..f72efdbf9fe 100644 --- a/e2e/spread/spread_test.go +++ b/e2e/spread/spread_test.go @@ -10,8 +10,8 @@ import ( "time" "github.com/hashicorp/nomad/api" - "github.com/hashicorp/nomad/e2e/e2eutil" - "github.com/hashicorp/nomad/helper/uuid" + "github.com/hashicorp/nomad/v2/e2e/e2eutil" + "github.com/hashicorp/nomad/v2/helper/uuid" "github.com/shoenig/test/must" "github.com/stretchr/testify/assert" ) diff --git a/e2e/task_schedule/task_schedule_test.go b/e2e/task_schedule/task_schedule_test.go index 13f2724be75..2f7e133be38 100644 --- a/e2e/task_schedule/task_schedule_test.go +++ b/e2e/task_schedule/task_schedule_test.go @@ -9,8 +9,8 @@ import ( "time" nomadapi "github.com/hashicorp/nomad/api" - "github.com/hashicorp/nomad/e2e/v3/cluster3" - "github.com/hashicorp/nomad/e2e/v3/jobs3" + "github.com/hashicorp/nomad/v2/e2e/v3/cluster3" + "github.com/hashicorp/nomad/v2/e2e/v3/jobs3" "github.com/shoenig/test/must" "github.com/shoenig/test/wait" ) diff --git a/e2e/taskevents/taskevents.go b/e2e/taskevents/taskevents.go index 970ac7e4125..b1af038712f 100644 --- a/e2e/taskevents/taskevents.go +++ b/e2e/taskevents/taskevents.go @@ -9,12 +9,12 @@ import ( "time" "github.com/hashicorp/nomad/api" - "github.com/hashicorp/nomad/e2e/framework" - "github.com/hashicorp/nomad/testutil" + "github.com/hashicorp/nomad/v2/e2e/framework" + "github.com/hashicorp/nomad/v2/testutil" "github.com/stretchr/testify/require" - "github.com/hashicorp/nomad/e2e/e2eutil" - "github.com/hashicorp/nomad/helper/uuid" + "github.com/hashicorp/nomad/v2/e2e/e2eutil" + "github.com/hashicorp/nomad/v2/helper/uuid" ) type TaskEventsTest struct { diff --git a/e2e/v3/jobs3/jobs3.go b/e2e/v3/jobs3/jobs3.go index ea5298e5b99..0c3c9ee9e76 100644 --- a/e2e/v3/jobs3/jobs3.go +++ b/e2e/v3/jobs3/jobs3.go @@ -16,8 +16,8 @@ import ( "github.com/hashicorp/go-set/v3" nomadapi "github.com/hashicorp/nomad/api" - "github.com/hashicorp/nomad/e2e/v3/util3" - "github.com/hashicorp/nomad/jobspec2" + "github.com/hashicorp/nomad/v2/e2e/v3/util3" + "github.com/hashicorp/nomad/v2/jobspec2" "github.com/shoenig/test" "github.com/shoenig/test/must" "github.com/shoenig/test/wait" diff --git a/e2e/v3/namespaces3/namespaces3.go b/e2e/v3/namespaces3/namespaces3.go index 40d1516561a..84a56404123 100644 --- a/e2e/v3/namespaces3/namespaces3.go +++ b/e2e/v3/namespaces3/namespaces3.go @@ -9,8 +9,8 @@ import ( "github.com/hashicorp/go-set/v3" nomadapi "github.com/hashicorp/nomad/api" - "github.com/hashicorp/nomad/e2e/v3/util3" - "github.com/hashicorp/nomad/helper" + "github.com/hashicorp/nomad/v2/e2e/v3/util3" + "github.com/hashicorp/nomad/v2/helper" "github.com/shoenig/test" "github.com/shoenig/test/must" ) diff --git a/e2e/v3/volumes3/host3.go b/e2e/v3/volumes3/host3.go index 6732615c474..338372b9a21 100644 --- a/e2e/v3/volumes3/host3.go +++ b/e2e/v3/volumes3/host3.go @@ -14,7 +14,7 @@ import ( "github.com/hashicorp/nomad/api" nomadapi "github.com/hashicorp/nomad/api" - "github.com/hashicorp/nomad/e2e/v3/util3" + "github.com/hashicorp/nomad/v2/e2e/v3/util3" "github.com/shoenig/test/must" "github.com/shoenig/test/wait" ) diff --git a/e2e/vaultcompat/vaultcompat_test.go b/e2e/vaultcompat/vaultcompat_test.go index 3873ddb7ed9..f222a779ff2 100644 --- a/e2e/vaultcompat/vaultcompat_test.go +++ b/e2e/vaultcompat/vaultcompat_test.go @@ -21,9 +21,9 @@ import ( goversion "github.com/hashicorp/go-version" "github.com/hashicorp/nomad/api" nomadapi "github.com/hashicorp/nomad/api" - "github.com/hashicorp/nomad/helper/testlog" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/testutil" + "github.com/hashicorp/nomad/v2/helper/testlog" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/testutil" vaultapi "github.com/hashicorp/vault/api" "github.com/shoenig/test/must" "github.com/shoenig/test/wait" diff --git a/e2e/vaultsecrets/vaultsecrets_test.go b/e2e/vaultsecrets/vaultsecrets_test.go index 720c50588ba..54de3871adb 100644 --- a/e2e/vaultsecrets/vaultsecrets_test.go +++ b/e2e/vaultsecrets/vaultsecrets_test.go @@ -15,11 +15,11 @@ import ( "testing" "time" - e2e "github.com/hashicorp/nomad/e2e/e2eutil" - "github.com/hashicorp/nomad/e2e/v3/cluster3" - "github.com/hashicorp/nomad/e2e/v3/jobs3" - "github.com/hashicorp/nomad/e2e/v3/namespaces3" - "github.com/hashicorp/nomad/helper/uuid" + e2e "github.com/hashicorp/nomad/v2/e2e/e2eutil" + "github.com/hashicorp/nomad/v2/e2e/v3/cluster3" + "github.com/hashicorp/nomad/v2/e2e/v3/jobs3" + "github.com/hashicorp/nomad/v2/e2e/v3/namespaces3" + "github.com/hashicorp/nomad/v2/helper/uuid" "github.com/shoenig/test" "github.com/shoenig/test/must" "github.com/shoenig/test/wait" diff --git a/e2e/volume_mounts/volumes_test.go b/e2e/volume_mounts/volumes_test.go index 1bb5a70f170..5d30d6c4004 100644 --- a/e2e/volume_mounts/volumes_test.go +++ b/e2e/volume_mounts/volumes_test.go @@ -10,8 +10,8 @@ import ( "github.com/shoenig/test/must" - "github.com/hashicorp/nomad/e2e/e2eutil" - "github.com/hashicorp/nomad/e2e/v3/jobs3" + "github.com/hashicorp/nomad/v2/e2e/e2eutil" + "github.com/hashicorp/nomad/v2/e2e/v3/jobs3" ) // TestVolumeMounts exercises host volume and Docker volume functionality for diff --git a/e2e/workload_id/nodemeta_test.go b/e2e/workload_id/nodemeta_test.go index 28ef75878aa..0677f92db37 100644 --- a/e2e/workload_id/nodemeta_test.go +++ b/e2e/workload_id/nodemeta_test.go @@ -9,9 +9,9 @@ import ( "time" "github.com/hashicorp/nomad/api" - "github.com/hashicorp/nomad/e2e/e2eutil" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/jobspec2" + "github.com/hashicorp/nomad/v2/e2e/e2eutil" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/jobspec2" "github.com/shoenig/test/must" ) diff --git a/e2e/workload_id/taskapi_test.go b/e2e/workload_id/taskapi_test.go index f1a90c4a6cd..b0a0ebbdc72 100644 --- a/e2e/workload_id/taskapi_test.go +++ b/e2e/workload_id/taskapi_test.go @@ -11,10 +11,10 @@ import ( "testing" "github.com/hashicorp/nomad/api" - "github.com/hashicorp/nomad/e2e/e2eutil" - "github.com/hashicorp/nomad/e2e/v3/cluster3" - "github.com/hashicorp/nomad/e2e/v3/jobs3" - "github.com/hashicorp/nomad/helper/uuid" + "github.com/hashicorp/nomad/v2/e2e/e2eutil" + "github.com/hashicorp/nomad/v2/e2e/v3/cluster3" + "github.com/hashicorp/nomad/v2/e2e/v3/jobs3" + "github.com/hashicorp/nomad/v2/helper/uuid" "github.com/shoenig/test" "github.com/shoenig/test/must" ) diff --git a/e2e/workload_id/workload_id_test.go b/e2e/workload_id/workload_id_test.go index 69e6a96b0ca..2309cc29aa6 100644 --- a/e2e/workload_id/workload_id_test.go +++ b/e2e/workload_id/workload_id_test.go @@ -10,8 +10,8 @@ import ( "strings" "testing" - "github.com/hashicorp/nomad/e2e/e2eutil" - "github.com/hashicorp/nomad/helper/uuid" + "github.com/hashicorp/nomad/v2/e2e/e2eutil" + "github.com/hashicorp/nomad/v2/helper/uuid" "github.com/shoenig/test/must" ) diff --git a/go.mod b/go.mod index fcb525dea9f..f3ff35b2d41 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/hashicorp/nomad +module github.com/hashicorp/nomad/v2 go 1.26.3 diff --git a/helper/boltdd/boltdd.go b/helper/boltdd/boltdd.go index 3afc6d8cd17..1d215a2687a 100644 --- a/helper/boltdd/boltdd.go +++ b/helper/boltdd/boltdd.go @@ -12,7 +12,7 @@ import ( "sync" "github.com/hashicorp/go-msgpack/v2/codec" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/nomad/structs" "go.etcd.io/bbolt" "golang.org/x/crypto/blake2b" ) diff --git a/helper/boltdd/boltdd_test.go b/helper/boltdd/boltdd_test.go index 5a30f774a93..d7ef3dc7a6d 100644 --- a/helper/boltdd/boltdd_test.go +++ b/helper/boltdd/boltdd_test.go @@ -10,9 +10,9 @@ import ( "testing" "github.com/hashicorp/go-msgpack/v2/codec" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" "github.com/shoenig/test/must" "go.etcd.io/bbolt" ) diff --git a/helper/broker/notify.go b/helper/broker/notify.go index 6193af247bc..121c6b6f601 100644 --- a/helper/broker/notify.go +++ b/helper/broker/notify.go @@ -7,7 +7,7 @@ import ( "context" "time" - "github.com/hashicorp/nomad/helper" + "github.com/hashicorp/nomad/v2/helper" ) // GenericNotifier allows a process to send updates to many subscribers in an diff --git a/helper/broker/notify_test.go b/helper/broker/notify_test.go index edb24740d30..d26b9642f55 100644 --- a/helper/broker/notify_test.go +++ b/helper/broker/notify_test.go @@ -9,7 +9,7 @@ import ( "testing" "time" - "github.com/hashicorp/nomad/ci" + "github.com/hashicorp/nomad/v2/ci" "github.com/stretchr/testify/require" ) diff --git a/helper/envoy/envoy_test.go b/helper/envoy/envoy_test.go index d122c05167a..371072760ff 100644 --- a/helper/envoy/envoy_test.go +++ b/helper/envoy/envoy_test.go @@ -7,8 +7,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/nomad/structs" "github.com/stretchr/testify/require" ) diff --git a/helper/file_test.go b/helper/file_test.go index 1e280e34180..cf30aab9f73 100644 --- a/helper/file_test.go +++ b/helper/file_test.go @@ -7,7 +7,7 @@ import ( "os" "testing" - "github.com/hashicorp/nomad/ci" + "github.com/hashicorp/nomad/v2/ci" "github.com/shoenig/test/must" ) diff --git a/helper/flags/autopilot_flags_test.go b/helper/flags/autopilot_flags_test.go index 088ef3d624d..00ace45a20e 100644 --- a/helper/flags/autopilot_flags_test.go +++ b/helper/flags/autopilot_flags_test.go @@ -8,7 +8,7 @@ import ( "testing" "time" - "github.com/hashicorp/nomad/ci" + "github.com/hashicorp/nomad/v2/ci" "github.com/stretchr/testify/require" ) diff --git a/helper/flags/flag_test.go b/helper/flags/flag_test.go index b1702357bde..79133d0a169 100644 --- a/helper/flags/flag_test.go +++ b/helper/flags/flag_test.go @@ -8,7 +8,7 @@ import ( "reflect" "testing" - "github.com/hashicorp/nomad/ci" + "github.com/hashicorp/nomad/v2/ci" "github.com/stretchr/testify/require" ) diff --git a/helper/opaque_test.go b/helper/opaque_test.go index 93a819a3c68..196eee25d7d 100644 --- a/helper/opaque_test.go +++ b/helper/opaque_test.go @@ -6,7 +6,7 @@ package helper import ( "testing" - "github.com/hashicorp/nomad/ci" + "github.com/hashicorp/nomad/v2/ci" "github.com/shoenig/test/must" ) diff --git a/helper/pluginutils/catalog/catalog.go b/helper/pluginutils/catalog/catalog.go index 99d1bb3941d..79d426c5c72 100644 --- a/helper/pluginutils/catalog/catalog.go +++ b/helper/pluginutils/catalog/catalog.go @@ -8,7 +8,7 @@ package catalog import ( "sync" - "github.com/hashicorp/nomad/helper/pluginutils/loader" + "github.com/hashicorp/nomad/v2/helper/pluginutils/loader" ) var ( diff --git a/helper/pluginutils/catalog/register.go b/helper/pluginutils/catalog/register.go index 9efc25514fe..acf5b290ee9 100644 --- a/helper/pluginutils/catalog/register.go +++ b/helper/pluginutils/catalog/register.go @@ -6,10 +6,10 @@ package catalog import ( - "github.com/hashicorp/nomad/drivers/docker" - "github.com/hashicorp/nomad/drivers/java" - "github.com/hashicorp/nomad/drivers/qemu" - "github.com/hashicorp/nomad/drivers/rawexec" + "github.com/hashicorp/nomad/v2/drivers/docker" + "github.com/hashicorp/nomad/v2/drivers/java" + "github.com/hashicorp/nomad/v2/drivers/qemu" + "github.com/hashicorp/nomad/v2/drivers/rawexec" ) // This file is where all builtin plugins should be registered in the catalog. diff --git a/helper/pluginutils/catalog/register_cgo.go b/helper/pluginutils/catalog/register_cgo.go index a5ee8fa48f8..4f980a2e1a1 100644 --- a/helper/pluginutils/catalog/register_cgo.go +++ b/helper/pluginutils/catalog/register_cgo.go @@ -6,11 +6,11 @@ package catalog import ( - "github.com/hashicorp/nomad/drivers/docker" - "github.com/hashicorp/nomad/drivers/exec" - "github.com/hashicorp/nomad/drivers/java" - "github.com/hashicorp/nomad/drivers/qemu" - "github.com/hashicorp/nomad/drivers/rawexec" + "github.com/hashicorp/nomad/v2/drivers/docker" + "github.com/hashicorp/nomad/v2/drivers/exec" + "github.com/hashicorp/nomad/v2/drivers/java" + "github.com/hashicorp/nomad/v2/drivers/qemu" + "github.com/hashicorp/nomad/v2/drivers/rawexec" ) // This file is where all builtin plugins should be registered in the catalog. diff --git a/helper/pluginutils/catalog/register_testing.go b/helper/pluginutils/catalog/register_testing.go index 581368669f6..92639a85449 100644 --- a/helper/pluginutils/catalog/register_testing.go +++ b/helper/pluginutils/catalog/register_testing.go @@ -6,7 +6,7 @@ package catalog -import "github.com/hashicorp/nomad/drivers/mock" +import "github.com/hashicorp/nomad/v2/drivers/mock" // Register the mock driver with the builtin driver plugin catalog. All builtin // plugins that are intended for production use should be registered in diff --git a/helper/pluginutils/catalog/testing.go b/helper/pluginutils/catalog/testing.go index f62472d454c..c932b48f73f 100644 --- a/helper/pluginutils/catalog/testing.go +++ b/helper/pluginutils/catalog/testing.go @@ -6,9 +6,9 @@ package catalog import ( "testing" - "github.com/hashicorp/nomad/helper/pluginutils/loader" - "github.com/hashicorp/nomad/helper/testlog" - "github.com/hashicorp/nomad/nomad/structs/config" + "github.com/hashicorp/nomad/v2/helper/pluginutils/loader" + "github.com/hashicorp/nomad/v2/helper/testlog" + "github.com/hashicorp/nomad/v2/nomad/structs/config" ) // TestPluginLoader returns a plugin loader populated only with internal plugins diff --git a/helper/pluginutils/grpcutils/utils.go b/helper/pluginutils/grpcutils/utils.go index 30c0e9c89e4..48221786fa5 100644 --- a/helper/pluginutils/grpcutils/utils.go +++ b/helper/pluginutils/grpcutils/utils.go @@ -7,7 +7,7 @@ import ( "context" "time" - "github.com/hashicorp/nomad/plugins/base/structs" + "github.com/hashicorp/nomad/v2/plugins/base/structs" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/helper/pluginutils/hclspecutils/dec.go b/helper/pluginutils/hclspecutils/dec.go index f1198eddeda..c30c8138b95 100644 --- a/helper/pluginutils/hclspecutils/dec.go +++ b/helper/pluginutils/hclspecutils/dec.go @@ -9,7 +9,7 @@ import ( hcl "github.com/hashicorp/hcl/v2" "github.com/hashicorp/hcl/v2/hcldec" "github.com/hashicorp/hcl/v2/hclsyntax" - "github.com/hashicorp/nomad/plugins/shared/hclspec" + "github.com/hashicorp/nomad/v2/plugins/shared/hclspec" ) var ( diff --git a/helper/pluginutils/hclspecutils/dec_test.go b/helper/pluginutils/hclspecutils/dec_test.go index f3b125946d2..0f9e5f0d6b4 100644 --- a/helper/pluginutils/hclspecutils/dec_test.go +++ b/helper/pluginutils/hclspecutils/dec_test.go @@ -7,8 +7,8 @@ import ( "testing" "github.com/hashicorp/hcl/v2/hcldec" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/plugins/shared/hclspec" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/plugins/shared/hclspec" "github.com/stretchr/testify/require" "github.com/zclconf/go-cty/cty" ) diff --git a/helper/pluginutils/hclutils/testing.go b/helper/pluginutils/hclutils/testing.go index 3e13c951abc..7fc577cb1f3 100644 --- a/helper/pluginutils/hclutils/testing.go +++ b/helper/pluginutils/hclutils/testing.go @@ -10,10 +10,10 @@ import ( "github.com/hashicorp/go-msgpack/v2/codec" "github.com/hashicorp/hcl" "github.com/hashicorp/hcl/hcl/ast" - "github.com/hashicorp/nomad/helper/pluginutils/hclspecutils" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/plugins/drivers" - "github.com/hashicorp/nomad/plugins/shared/hclspec" + "github.com/hashicorp/nomad/v2/helper/pluginutils/hclspecutils" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/plugins/drivers" + "github.com/hashicorp/nomad/v2/plugins/shared/hclspec" "github.com/stretchr/testify/require" "github.com/zclconf/go-cty/cty" ) diff --git a/helper/pluginutils/hclutils/types_test.go b/helper/pluginutils/hclutils/types_test.go index 0453f9a3e44..1619965eef9 100644 --- a/helper/pluginutils/hclutils/types_test.go +++ b/helper/pluginutils/hclutils/types_test.go @@ -6,8 +6,8 @@ package hclutils_test import ( "testing" - "github.com/hashicorp/nomad/helper/pluginutils/hclutils" - "github.com/hashicorp/nomad/plugins/shared/hclspec" + "github.com/hashicorp/nomad/v2/helper/pluginutils/hclutils" + "github.com/hashicorp/nomad/v2/plugins/shared/hclspec" "github.com/stretchr/testify/require" ) diff --git a/helper/pluginutils/hclutils/util.go b/helper/pluginutils/hclutils/util.go index a47aeed1ce9..5da1181f2e9 100644 --- a/helper/pluginutils/hclutils/util.go +++ b/helper/pluginutils/hclutils/util.go @@ -15,7 +15,7 @@ import ( "github.com/hashicorp/hcl/v2/hcldec" hjson "github.com/hashicorp/hcl/v2/json" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/nomad/structs" "github.com/zclconf/go-cty/cty" "github.com/zclconf/go-cty/cty/function" diff --git a/helper/pluginutils/hclutils/util_test.go b/helper/pluginutils/hclutils/util_test.go index 585621061b8..72aab7f9a05 100644 --- a/helper/pluginutils/hclutils/util_test.go +++ b/helper/pluginutils/hclutils/util_test.go @@ -7,11 +7,11 @@ import ( "testing" "github.com/hashicorp/hcl/v2/hcldec" - "github.com/hashicorp/nomad/drivers/docker" - "github.com/hashicorp/nomad/helper/pluginutils/hclspecutils" - "github.com/hashicorp/nomad/helper/pluginutils/hclutils" - "github.com/hashicorp/nomad/plugins/drivers" - "github.com/hashicorp/nomad/plugins/shared/hclspec" + "github.com/hashicorp/nomad/v2/drivers/docker" + "github.com/hashicorp/nomad/v2/helper/pluginutils/hclspecutils" + "github.com/hashicorp/nomad/v2/helper/pluginutils/hclutils" + "github.com/hashicorp/nomad/v2/plugins/drivers" + "github.com/hashicorp/nomad/v2/plugins/shared/hclspec" "github.com/kr/pretty" "github.com/shoenig/test/must" "github.com/zclconf/go-cty/cty" diff --git a/helper/pluginutils/loader/api_versions.go b/helper/pluginutils/loader/api_versions.go index 26282f32a3f..6ead694ecc2 100644 --- a/helper/pluginutils/loader/api_versions.go +++ b/helper/pluginutils/loader/api_versions.go @@ -4,9 +4,9 @@ package loader import ( - "github.com/hashicorp/nomad/plugins/base" - "github.com/hashicorp/nomad/plugins/device" - "github.com/hashicorp/nomad/plugins/drivers" + "github.com/hashicorp/nomad/v2/plugins/base" + "github.com/hashicorp/nomad/v2/plugins/device" + "github.com/hashicorp/nomad/v2/plugins/drivers" ) var ( diff --git a/helper/pluginutils/loader/init.go b/helper/pluginutils/loader/init.go index 9fdce8246c9..49cba94479f 100644 --- a/helper/pluginutils/loader/init.go +++ b/helper/pluginutils/loader/init.go @@ -14,10 +14,10 @@ import ( multierror "github.com/hashicorp/go-multierror" plugin "github.com/hashicorp/go-plugin" version "github.com/hashicorp/go-version" - "github.com/hashicorp/nomad/helper/pluginutils/hclspecutils" - "github.com/hashicorp/nomad/helper/pluginutils/hclutils" - "github.com/hashicorp/nomad/nomad/structs/config" - "github.com/hashicorp/nomad/plugins/base" + "github.com/hashicorp/nomad/v2/helper/pluginutils/hclspecutils" + "github.com/hashicorp/nomad/v2/helper/pluginutils/hclutils" + "github.com/hashicorp/nomad/v2/nomad/structs/config" + "github.com/hashicorp/nomad/v2/plugins/base" "github.com/zclconf/go-cty/cty/msgpack" ) diff --git a/helper/pluginutils/loader/loader.go b/helper/pluginutils/loader/loader.go index f8e6a12d56a..8e719a7f3c7 100644 --- a/helper/pluginutils/loader/loader.go +++ b/helper/pluginutils/loader/loader.go @@ -11,12 +11,12 @@ import ( log "github.com/hashicorp/go-hclog" plugin "github.com/hashicorp/go-plugin" version "github.com/hashicorp/go-version" - "github.com/hashicorp/nomad/nomad/structs/config" - "github.com/hashicorp/nomad/plugins" - "github.com/hashicorp/nomad/plugins/base" - "github.com/hashicorp/nomad/plugins/device" - "github.com/hashicorp/nomad/plugins/drivers" - "github.com/hashicorp/nomad/plugins/shared/hclspec" + "github.com/hashicorp/nomad/v2/nomad/structs/config" + "github.com/hashicorp/nomad/v2/plugins" + "github.com/hashicorp/nomad/v2/plugins/base" + "github.com/hashicorp/nomad/v2/plugins/device" + "github.com/hashicorp/nomad/v2/plugins/drivers" + "github.com/hashicorp/nomad/v2/plugins/shared/hclspec" ) // PluginCatalog is used to retrieve plugins, either external or internal diff --git a/helper/pluginutils/loader/loader_test.go b/helper/pluginutils/loader/loader_test.go index 146eb109196..1f2775ac5c5 100644 --- a/helper/pluginutils/loader/loader_test.go +++ b/helper/pluginutils/loader/loader_test.go @@ -14,11 +14,11 @@ import ( log "github.com/hashicorp/go-hclog" version "github.com/hashicorp/go-version" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/helper/testlog" - "github.com/hashicorp/nomad/nomad/structs/config" - "github.com/hashicorp/nomad/plugins/base" - "github.com/hashicorp/nomad/plugins/device" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/helper/testlog" + "github.com/hashicorp/nomad/v2/nomad/structs/config" + "github.com/hashicorp/nomad/v2/plugins/base" + "github.com/hashicorp/nomad/v2/plugins/device" "github.com/stretchr/testify/require" ) diff --git a/helper/pluginutils/loader/plugin_test.go b/helper/pluginutils/loader/plugin_test.go index 4b9c466086d..17580350cbe 100644 --- a/helper/pluginutils/loader/plugin_test.go +++ b/helper/pluginutils/loader/plugin_test.go @@ -13,9 +13,9 @@ import ( log "github.com/hashicorp/go-hclog" plugin "github.com/hashicorp/go-plugin" - "github.com/hashicorp/nomad/plugins/base" - "github.com/hashicorp/nomad/plugins/device" - "github.com/hashicorp/nomad/plugins/shared/hclspec" + "github.com/hashicorp/nomad/v2/plugins/base" + "github.com/hashicorp/nomad/v2/plugins/device" + "github.com/hashicorp/nomad/v2/plugins/shared/hclspec" ) type stringSliceFlags []string diff --git a/helper/pluginutils/loader/testing.go b/helper/pluginutils/loader/testing.go index 91c940e4a08..e2fbf554183 100644 --- a/helper/pluginutils/loader/testing.go +++ b/helper/pluginutils/loader/testing.go @@ -9,7 +9,7 @@ import ( log "github.com/hashicorp/go-hclog" plugin "github.com/hashicorp/go-plugin" - "github.com/hashicorp/nomad/plugins/base" + "github.com/hashicorp/nomad/v2/plugins/base" ) // MockCatalog provides a mock PluginCatalog to be used for testing diff --git a/helper/pluginutils/loader/util.go b/helper/pluginutils/loader/util.go index c0e796e3b4c..eca9ac33952 100644 --- a/helper/pluginutils/loader/util.go +++ b/helper/pluginutils/loader/util.go @@ -6,7 +6,7 @@ package loader import ( "strings" - "github.com/hashicorp/nomad/nomad/structs/config" + "github.com/hashicorp/nomad/v2/nomad/structs/config" ) // configMap returns a mapping of plugin binary name to config. diff --git a/helper/pluginutils/singleton/future.go b/helper/pluginutils/singleton/future.go index 51422f2b323..c983f73238b 100644 --- a/helper/pluginutils/singleton/future.go +++ b/helper/pluginutils/singleton/future.go @@ -4,8 +4,8 @@ package singleton import ( - "github.com/hashicorp/nomad/helper/pluginutils/loader" - "github.com/hashicorp/nomad/helper/uuid" + "github.com/hashicorp/nomad/v2/helper/pluginutils/loader" + "github.com/hashicorp/nomad/v2/helper/uuid" ) // future is a sharable future for retrieving a plugin instance or any error diff --git a/helper/pluginutils/singleton/singleton.go b/helper/pluginutils/singleton/singleton.go index 39f84a9679a..ef9b320695e 100644 --- a/helper/pluginutils/singleton/singleton.go +++ b/helper/pluginutils/singleton/singleton.go @@ -9,8 +9,8 @@ import ( log "github.com/hashicorp/go-hclog" plugin "github.com/hashicorp/go-plugin" - "github.com/hashicorp/nomad/helper/pluginutils/loader" - "github.com/hashicorp/nomad/plugins/base" + "github.com/hashicorp/nomad/v2/helper/pluginutils/loader" + "github.com/hashicorp/nomad/v2/plugins/base" ) var ( diff --git a/helper/pluginutils/singleton/singleton_test.go b/helper/pluginutils/singleton/singleton_test.go index 805adf88ec4..be1ef060a77 100644 --- a/helper/pluginutils/singleton/singleton_test.go +++ b/helper/pluginutils/singleton/singleton_test.go @@ -11,10 +11,10 @@ import ( log "github.com/hashicorp/go-hclog" plugin "github.com/hashicorp/go-plugin" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/helper/pluginutils/loader" - "github.com/hashicorp/nomad/helper/testlog" - "github.com/hashicorp/nomad/plugins/base" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/helper/pluginutils/loader" + "github.com/hashicorp/nomad/v2/helper/testlog" + "github.com/hashicorp/nomad/v2/plugins/base" "github.com/stretchr/testify/require" ) diff --git a/helper/pointer/pointer_test.go b/helper/pointer/pointer_test.go index 4bd059fc499..2ed2ed19ae4 100644 --- a/helper/pointer/pointer_test.go +++ b/helper/pointer/pointer_test.go @@ -7,7 +7,7 @@ import ( "testing" "time" - "github.com/hashicorp/nomad/ci" + "github.com/hashicorp/nomad/v2/ci" "github.com/shoenig/test/must" ) diff --git a/helper/pool/pool.go b/helper/pool/pool.go index a9d1465e2c0..583610e9d43 100644 --- a/helper/pool/pool.go +++ b/helper/pool/pool.go @@ -16,9 +16,9 @@ import ( hclog "github.com/hashicorp/go-hclog" msgpackrpc "github.com/hashicorp/net-rpc-msgpackrpc/v2" - "github.com/hashicorp/nomad/helper" - "github.com/hashicorp/nomad/helper/tlsutil" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/helper" + "github.com/hashicorp/nomad/v2/helper/tlsutil" + "github.com/hashicorp/nomad/v2/nomad/structs" "github.com/hashicorp/yamux" ) diff --git a/helper/pool/pool_test.go b/helper/pool/pool_test.go index 0d5862ce77b..781884053a3 100644 --- a/helper/pool/pool_test.go +++ b/helper/pool/pool_test.go @@ -11,8 +11,8 @@ import ( "time" "github.com/hashicorp/go-hclog" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/helper/testlog" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/helper/testlog" "github.com/hashicorp/yamux" "github.com/shoenig/test/must" ) diff --git a/helper/raftutil/fsm.go b/helper/raftutil/fsm.go index f57f29d23c3..1d46a83ddbd 100644 --- a/helper/raftutil/fsm.go +++ b/helper/raftutil/fsm.go @@ -11,9 +11,9 @@ import ( "github.com/hashicorp/go-hclog" "github.com/hashicorp/go-memdb" - "github.com/hashicorp/nomad/nomad" - "github.com/hashicorp/nomad/nomad/state" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/nomad" + "github.com/hashicorp/nomad/v2/nomad/state" + "github.com/hashicorp/nomad/v2/nomad/structs" "github.com/hashicorp/raft" ) diff --git a/helper/raftutil/fsm_ce.go b/helper/raftutil/fsm_ce.go index d5f3405457b..c5b40b8ca67 100644 --- a/helper/raftutil/fsm_ce.go +++ b/helper/raftutil/fsm_ce.go @@ -6,7 +6,7 @@ package raftutil -import "github.com/hashicorp/nomad/nomad/state" +import "github.com/hashicorp/nomad/v2/nomad/state" func insertEnterpriseState(m map[string][]interface{}, state *state.StateStore) { } diff --git a/helper/raftutil/fsm_test.go b/helper/raftutil/fsm_test.go index 3148b7af1f8..cdef17144dc 100644 --- a/helper/raftutil/fsm_test.go +++ b/helper/raftutil/fsm_test.go @@ -7,7 +7,7 @@ import ( "testing" "github.com/hashicorp/go-hclog" - "github.com/hashicorp/nomad/ci" + "github.com/hashicorp/nomad/v2/ci" "github.com/shoenig/test/must" ) diff --git a/helper/raftutil/generate_msgtypes.sh b/helper/raftutil/generate_msgtypes.sh index 5782445f9c9..c9aa25b90c8 100755 --- a/helper/raftutil/generate_msgtypes.sh +++ b/helper/raftutil/generate_msgtypes.sh @@ -7,7 +7,7 @@ generate_file() { // Code generated by go generate; DO NOT EDIT. package raftutil -import "github.com/hashicorp/nomad/nomad/structs" +import "github.com/hashicorp/nomad/v2/nomad/structs" var msgTypeNames = map[structs.MessageType]string{ EOF diff --git a/helper/raftutil/msgpack.go b/helper/raftutil/msgpack.go index 2f0f9402110..c5fa6ef8339 100644 --- a/helper/raftutil/msgpack.go +++ b/helper/raftutil/msgpack.go @@ -10,7 +10,7 @@ import ( "unicode" "github.com/hashicorp/go-msgpack/v2/codec" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/nomad/structs" ) // fixTime converts any suspected time.Time binary string representation to time.Time diff --git a/helper/raftutil/msgpack_test.go b/helper/raftutil/msgpack_test.go index a731262614b..f6a1352941a 100644 --- a/helper/raftutil/msgpack_test.go +++ b/helper/raftutil/msgpack_test.go @@ -10,8 +10,8 @@ import ( "time" "github.com/hashicorp/go-msgpack/v2/codec" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/nomad/structs" "github.com/stretchr/testify/require" ) diff --git a/helper/raftutil/msgtypes.go b/helper/raftutil/msgtypes.go index d70e2aea211..2035b1cbb21 100644 --- a/helper/raftutil/msgtypes.go +++ b/helper/raftutil/msgtypes.go @@ -1,7 +1,7 @@ // Code generated by go generate; DO NOT EDIT. package raftutil -import "github.com/hashicorp/nomad/nomad/structs" +import "github.com/hashicorp/nomad/v2/nomad/structs" var msgTypeNames = map[structs.MessageType]string{ structs.NodeRegisterRequestType: "NodeRegisterRequestType", diff --git a/helper/raftutil/sample_test.go b/helper/raftutil/sample_test.go index 8d4ca4af4f8..edfb6f09012 100644 --- a/helper/raftutil/sample_test.go +++ b/helper/raftutil/sample_test.go @@ -6,11 +6,11 @@ package raftutil import ( "testing" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/nomad/state" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/scheduler" - "github.com/hashicorp/nomad/scheduler/tests" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/nomad/state" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/scheduler" + "github.com/hashicorp/nomad/v2/scheduler/tests" "github.com/kr/pretty" "github.com/stretchr/testify/require" ) diff --git a/helper/raftutil/snapshot.go b/helper/raftutil/snapshot.go index 4f3a28cfd8a..941376f907b 100644 --- a/helper/raftutil/snapshot.go +++ b/helper/raftutil/snapshot.go @@ -9,10 +9,10 @@ import ( "os" "github.com/hashicorp/go-hclog" - "github.com/hashicorp/nomad/helper/snapshot" - "github.com/hashicorp/nomad/nomad" - "github.com/hashicorp/nomad/nomad/state" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/helper/snapshot" + "github.com/hashicorp/nomad/v2/nomad" + "github.com/hashicorp/nomad/v2/nomad/state" + "github.com/hashicorp/nomad/v2/nomad/structs" "github.com/hashicorp/raft" ) diff --git a/helper/raftutil/state.go b/helper/raftutil/state.go index 4ad66920dd9..0d9501806c4 100644 --- a/helper/raftutil/state.go +++ b/helper/raftutil/state.go @@ -13,7 +13,7 @@ import ( "time" "github.com/hashicorp/go-msgpack/v2/codec" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/nomad/structs" "github.com/hashicorp/raft" raftboltdb "github.com/hashicorp/raft-boltdb/v2" raftwal "github.com/hashicorp/raft-wal" diff --git a/helper/raftutil/state_test.go b/helper/raftutil/state_test.go index 03553e37c13..53f8c4ca9ad 100644 --- a/helper/raftutil/state_test.go +++ b/helper/raftutil/state_test.go @@ -7,7 +7,7 @@ import ( "path/filepath" "testing" - "github.com/hashicorp/nomad/ci" + "github.com/hashicorp/nomad/v2/ci" raftboltdb "github.com/hashicorp/raft-boltdb/v2" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/helper/snapshot/snapshot_test.go b/helper/snapshot/snapshot_test.go index cd0325cf928..e56c229594d 100644 --- a/helper/snapshot/snapshot_test.go +++ b/helper/snapshot/snapshot_test.go @@ -17,8 +17,8 @@ import ( "github.com/hashicorp/consul/sdk/testutil" "github.com/hashicorp/go-msgpack/v2/codec" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/nomad/structs" "github.com/hashicorp/raft" "github.com/shoenig/test/must" "github.com/stretchr/testify/require" diff --git a/helper/testtask/testtask.go b/helper/testtask/testtask.go index 632828d4ab5..facb3428d5c 100644 --- a/helper/testtask/testtask.go +++ b/helper/testtask/testtask.go @@ -11,8 +11,8 @@ import ( "os/exec" "time" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/plugins/drivers" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/plugins/drivers" ) // Path returns the path to the currently running executable. diff --git a/helper/tlsutil/config.go b/helper/tlsutil/config.go index 92de7301f37..c41da039b60 100644 --- a/helper/tlsutil/config.go +++ b/helper/tlsutil/config.go @@ -14,7 +14,7 @@ import ( "strings" "time" - "github.com/hashicorp/nomad/nomad/structs/config" + "github.com/hashicorp/nomad/v2/nomad/structs/config" ) // supportedTLSVersions are the current TLS versions that Nomad supports diff --git a/helper/tlsutil/config_test.go b/helper/tlsutil/config_test.go index 3e271e77dd6..e6efde3bf91 100644 --- a/helper/tlsutil/config_test.go +++ b/helper/tlsutil/config_test.go @@ -13,8 +13,8 @@ import ( "strings" "testing" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/nomad/structs/config" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/nomad/structs/config" "github.com/hashicorp/yamux" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/helper/tlsutil/generate_test.go b/helper/tlsutil/generate_test.go index e5fa6901113..b793a4a6663 100644 --- a/helper/tlsutil/generate_test.go +++ b/helper/tlsutil/generate_test.go @@ -17,7 +17,7 @@ import ( "testing" "time" - "github.com/hashicorp/nomad/ci" + "github.com/hashicorp/nomad/v2/ci" "github.com/stretchr/testify/require" ) diff --git a/helper/useragent/useragent.go b/helper/useragent/useragent.go index b845d382590..b62e47403e0 100644 --- a/helper/useragent/useragent.go +++ b/helper/useragent/useragent.go @@ -8,7 +8,7 @@ import ( "net/http" "runtime" - "github.com/hashicorp/nomad/version" + "github.com/hashicorp/nomad/v2/version" ) const ( diff --git a/helper/users/cache.go b/helper/users/cache.go index be237b18bac..3476a438192 100644 --- a/helper/users/cache.go +++ b/helper/users/cache.go @@ -8,7 +8,7 @@ import ( "sync" "time" - "github.com/hashicorp/nomad/lib/lang" + "github.com/hashicorp/nomad/v2/lib/lang" "oss.indeed.com/go/libtime" ) diff --git a/helper/users/cache_test.go b/helper/users/cache_test.go index ab34acade9f..d6a89388314 100644 --- a/helper/users/cache_test.go +++ b/helper/users/cache_test.go @@ -11,7 +11,7 @@ import ( "testing" "time" - "github.com/hashicorp/nomad/ci" + "github.com/hashicorp/nomad/v2/ci" "github.com/shoenig/test/must" "oss.indeed.com/go/libtime/libtimetest" ) diff --git a/helper/users/dynamic/pool.go b/helper/users/dynamic/pool.go index fc7036398e0..a47b054f9cd 100644 --- a/helper/users/dynamic/pool.go +++ b/helper/users/dynamic/pool.go @@ -12,7 +12,7 @@ import ( "sync" "github.com/hashicorp/go-set/v3" - "github.com/hashicorp/nomad/helper" + "github.com/hashicorp/nomad/v2/helper" ) var ( diff --git a/helper/users/dynamic/users.go b/helper/users/dynamic/users.go index 64e844e4e67..3db9d63aa32 100644 --- a/helper/users/dynamic/users.go +++ b/helper/users/dynamic/users.go @@ -9,7 +9,7 @@ import ( "regexp" "strconv" - "github.com/hashicorp/nomad/helper/users" + "github.com/hashicorp/nomad/v2/helper/users" ) const ( diff --git a/helper/users/lookup_linux_test.go b/helper/users/lookup_linux_test.go index 304a985ed48..670014d4570 100644 --- a/helper/users/lookup_linux_test.go +++ b/helper/users/lookup_linux_test.go @@ -14,7 +14,7 @@ import ( "syscall" "testing" - "github.com/hashicorp/nomad/helper/testlog" + "github.com/hashicorp/nomad/v2/helper/testlog" "github.com/shoenig/test/must" "golang.org/x/sys/unix" ) diff --git a/helper/users/lookup_windows_test.go b/helper/users/lookup_windows_test.go index 396cb3029bc..167a407bbce 100644 --- a/helper/users/lookup_windows_test.go +++ b/helper/users/lookup_windows_test.go @@ -11,7 +11,7 @@ import ( "path/filepath" "testing" - "github.com/hashicorp/nomad/helper/testlog" + "github.com/hashicorp/nomad/v2/helper/testlog" "github.com/shoenig/test/must" ) diff --git a/helper/uuid/uuid.go b/helper/uuid/uuid.go index 71f52994e77..4b636e0fa30 100644 --- a/helper/uuid/uuid.go +++ b/helper/uuid/uuid.go @@ -6,7 +6,7 @@ package uuid import ( "fmt" - "github.com/hashicorp/nomad/helper/crypto" + "github.com/hashicorp/nomad/v2/helper/crypto" ) // Generate is used to generate a random UUID. diff --git a/helper/warning_test.go b/helper/warning_test.go index 37ba45e54c6..98c7fbf00c2 100644 --- a/helper/warning_test.go +++ b/helper/warning_test.go @@ -8,7 +8,7 @@ import ( "strings" "testing" - "github.com/hashicorp/nomad/ci" + "github.com/hashicorp/nomad/v2/ci" "github.com/shoenig/test/must" ) diff --git a/helper/winsvc/events_windows.go b/helper/winsvc/events_windows.go index 8ad7b2b88c0..1a720a6154d 100644 --- a/helper/winsvc/events_windows.go +++ b/helper/winsvc/events_windows.go @@ -7,7 +7,7 @@ import ( "time" "github.com/hashicorp/go-hclog" - "github.com/hashicorp/nomad/helper" + "github.com/hashicorp/nomad/v2/helper" ) var chanEvents = make(chan Event) diff --git a/helper/winsvc/path_windows_test.go b/helper/winsvc/path_windows_test.go index cc798d8d452..bc9ff85d0ae 100644 --- a/helper/winsvc/path_windows_test.go +++ b/helper/winsvc/path_windows_test.go @@ -9,7 +9,7 @@ import ( "testing" "unsafe" - "github.com/hashicorp/nomad/ci" + "github.com/hashicorp/nomad/v2/ci" "github.com/shoenig/test/must" "golang.org/x/sys/windows" ) diff --git a/helper/winsvc/windows_service_windows.go b/helper/winsvc/windows_service_windows.go index 19315ab61d7..ebf8de27804 100644 --- a/helper/winsvc/windows_service_windows.go +++ b/helper/winsvc/windows_service_windows.go @@ -14,7 +14,7 @@ import ( "slices" "time" - "github.com/hashicorp/nomad/helper" + "github.com/hashicorp/nomad/v2/helper" "golang.org/x/sys/windows/registry" "golang.org/x/sys/windows/svc" "golang.org/x/sys/windows/svc/eventlog" diff --git a/helper/winsvc/windows_service_windows_test.go b/helper/winsvc/windows_service_windows_test.go index 43fd3dde063..4cde2ceddcd 100644 --- a/helper/winsvc/windows_service_windows_test.go +++ b/helper/winsvc/windows_service_windows_test.go @@ -9,7 +9,7 @@ import ( "testing" "github.com/hashicorp/go-uuid" - "github.com/hashicorp/nomad/ci" + "github.com/hashicorp/nomad/v2/ci" "github.com/shoenig/test/must" "golang.org/x/sys/windows/registry" "golang.org/x/sys/windows/svc" diff --git a/internal/testing/apitests/acl_test.go b/internal/testing/apitests/acl_test.go index 533c45174dd..a6b447fa11d 100644 --- a/internal/testing/apitests/acl_test.go +++ b/internal/testing/apitests/acl_test.go @@ -10,7 +10,7 @@ import ( capOIDC "github.com/hashicorp/cap/oidc" "github.com/hashicorp/nomad/api" - "github.com/hashicorp/nomad/ci" + "github.com/hashicorp/nomad/v2/ci" "github.com/shoenig/test/must" ) diff --git a/internal/testing/apitests/api_test.go b/internal/testing/apitests/api_test.go index c7af21c1718..1ed6f4bb299 100644 --- a/internal/testing/apitests/api_test.go +++ b/internal/testing/apitests/api_test.go @@ -7,7 +7,7 @@ import ( "testing" "github.com/hashicorp/nomad/api" - "github.com/hashicorp/nomad/testutil" + "github.com/hashicorp/nomad/v2/testutil" ) type configCallback func(c *api.Config) diff --git a/internal/testing/apitests/jobs_test.go b/internal/testing/apitests/jobs_test.go index b7b4d3975d6..a47ec1c6eb9 100644 --- a/internal/testing/apitests/jobs_test.go +++ b/internal/testing/apitests/jobs_test.go @@ -7,8 +7,8 @@ import ( "testing" "github.com/hashicorp/nomad/api" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/nomad/mock" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/nomad/mock" "github.com/stretchr/testify/assert" ) diff --git a/internal/testing/apitests/nodes_test.go b/internal/testing/apitests/nodes_test.go index e33eb4a2352..908908d7e12 100644 --- a/internal/testing/apitests/nodes_test.go +++ b/internal/testing/apitests/nodes_test.go @@ -6,9 +6,9 @@ package apitests import ( "testing" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/nomad/structs" "github.com/stretchr/testify/require" ) diff --git a/internal/testing/apitests/operator_autopilot_test.go b/internal/testing/apitests/operator_autopilot_test.go index 931c6835770..adb4cf63c97 100644 --- a/internal/testing/apitests/operator_autopilot_test.go +++ b/internal/testing/apitests/operator_autopilot_test.go @@ -8,8 +8,8 @@ import ( "testing" "github.com/hashicorp/nomad/api" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/testutil" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/testutil" "github.com/shoenig/test/must" "github.com/shoenig/test/wait" ) diff --git a/internal/testing/apitests/operator_test.go b/internal/testing/apitests/operator_test.go index a2140dff3ff..9cd31a9e3aa 100644 --- a/internal/testing/apitests/operator_test.go +++ b/internal/testing/apitests/operator_test.go @@ -7,7 +7,7 @@ import ( "testing" "github.com/hashicorp/nomad/api" - "github.com/hashicorp/nomad/ci" + "github.com/hashicorp/nomad/v2/ci" "github.com/shoenig/test/must" "github.com/shoenig/test/wait" ) diff --git a/internal/testing/apitests/streamingsync_test.go b/internal/testing/apitests/streamingsync_test.go index ddd68dd38ab..35e08e64d0c 100644 --- a/internal/testing/apitests/streamingsync_test.go +++ b/internal/testing/apitests/streamingsync_test.go @@ -8,8 +8,8 @@ import ( "testing" "github.com/hashicorp/nomad/api" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/plugins/drivers" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/plugins/drivers" "github.com/stretchr/testify/require" ) diff --git a/internal/testing/apitests/structsync_test.go b/internal/testing/apitests/structsync_test.go index 377e3e37ad9..f0b462974d6 100644 --- a/internal/testing/apitests/structsync_test.go +++ b/internal/testing/apitests/structsync_test.go @@ -8,8 +8,8 @@ import ( "testing" "github.com/hashicorp/nomad/api" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/nomad/structs" "github.com/stretchr/testify/require" ) diff --git a/internal/testing/apitests/tasks_test.go b/internal/testing/apitests/tasks_test.go index af656ed98bf..8c6cc462b4d 100644 --- a/internal/testing/apitests/tasks_test.go +++ b/internal/testing/apitests/tasks_test.go @@ -8,8 +8,8 @@ import ( "time" "github.com/hashicorp/nomad/api" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/nomad/structs" "github.com/stretchr/testify/assert" ) diff --git a/jobspec2/types.config.go b/jobspec2/types.config.go index ea6134c23b2..a1b210cc9da 100644 --- a/jobspec2/types.config.go +++ b/jobspec2/types.config.go @@ -10,7 +10,7 @@ import ( "github.com/hashicorp/hcl/v2" "github.com/hashicorp/hcl/v2/ext/dynblock" "github.com/hashicorp/nomad/api" - "github.com/hashicorp/nomad/jobspec2/hclutil" + "github.com/hashicorp/nomad/v2/jobspec2/hclutil" "github.com/zclconf/go-cty/cty" ) diff --git a/jobspec2/types.variables.go b/jobspec2/types.variables.go index 21f75f527cc..47433cf78f7 100644 --- a/jobspec2/types.variables.go +++ b/jobspec2/types.variables.go @@ -15,7 +15,7 @@ import ( "github.com/hashicorp/hcl/v2/ext/typeexpr" "github.com/hashicorp/hcl/v2/gohcl" "github.com/hashicorp/hcl/v2/hclsyntax" - "github.com/hashicorp/nomad/jobspec2/addrs" + "github.com/hashicorp/nomad/v2/jobspec2/addrs" "github.com/zclconf/go-cty/cty" "github.com/zclconf/go-cty/cty/convert" ) diff --git a/lib/auth/binder.go b/lib/auth/binder.go index 3ea563c7c25..b44a0062581 100644 --- a/lib/auth/binder.go +++ b/lib/auth/binder.go @@ -12,7 +12,7 @@ import ( "github.com/hashicorp/go-memdb" "github.com/hashicorp/hil" "github.com/hashicorp/hil/ast" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/nomad/structs" ) // Binder is responsible for collecting the ACL roles and policies to be diff --git a/lib/auth/binder_test.go b/lib/auth/binder_test.go index 613e7d12a23..e1ba11e412d 100644 --- a/lib/auth/binder_test.go +++ b/lib/auth/binder_test.go @@ -9,11 +9,11 @@ import ( "github.com/shoenig/test/must" "github.com/hashicorp/go-hclog" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/state" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/state" + "github.com/hashicorp/nomad/v2/nomad/structs" ) func TestBinder_Bind(t *testing.T) { diff --git a/lib/auth/claims.go b/lib/auth/claims.go index 87b2de34920..8bf3c5f9e1a 100644 --- a/lib/auth/claims.go +++ b/lib/auth/claims.go @@ -11,7 +11,7 @@ import ( "github.com/mitchellh/pointerstructure" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/nomad/structs" ) // SelectorData returns the data for go-bexpr for selector evaluation. diff --git a/lib/auth/claims_test.go b/lib/auth/claims_test.go index 269fe4472c0..6c85727afc8 100644 --- a/lib/auth/claims_test.go +++ b/lib/auth/claims_test.go @@ -8,7 +8,7 @@ import ( "github.com/shoenig/test/must" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/nomad/structs" ) func TestSelectorData(t *testing.T) { diff --git a/lib/auth/identity.go b/lib/auth/identity.go index c76a9579a78..cf6bd73da0b 100644 --- a/lib/auth/identity.go +++ b/lib/auth/identity.go @@ -4,7 +4,7 @@ package auth import ( - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/nomad/structs" ) type Identity struct { diff --git a/lib/auth/identity_test.go b/lib/auth/identity_test.go index b55ae5887f5..dc8279c13e6 100644 --- a/lib/auth/identity_test.go +++ b/lib/auth/identity_test.go @@ -8,8 +8,8 @@ import ( "github.com/shoenig/test/must" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/nomad/structs" ) func Test_NewIdentity(t *testing.T) { diff --git a/lib/auth/jwt/validator.go b/lib/auth/jwt/validator.go index 8f96795011d..b06e8f062a5 100644 --- a/lib/auth/jwt/validator.go +++ b/lib/auth/jwt/validator.go @@ -12,8 +12,8 @@ import ( "github.com/hashicorp/cap/jwt" metrics "github.com/hashicorp/go-metrics/compat" - "github.com/hashicorp/nomad/helper" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/helper" + "github.com/hashicorp/nomad/v2/nomad/structs" ) // Validate performs token signature verification and JWT header validation, diff --git a/lib/auth/jwt/validator_test.go b/lib/auth/jwt/validator_test.go index 2e4d6ababfc..f5c9da93652 100644 --- a/lib/auth/jwt/validator_test.go +++ b/lib/auth/jwt/validator_test.go @@ -15,8 +15,8 @@ import ( "github.com/hashicorp/cap/oidc" "github.com/shoenig/test/must" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" ) func TestValidate(t *testing.T) { diff --git a/lib/auth/oidc/client_assertion.go b/lib/auth/oidc/client_assertion.go index 284eb941a22..a31ea3e670e 100644 --- a/lib/auth/oidc/client_assertion.go +++ b/lib/auth/oidc/client_assertion.go @@ -28,7 +28,7 @@ import ( gojwt "github.com/golang-jwt/jwt/v5" cass "github.com/hashicorp/cap/oidc/clientassertion" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/nomad/structs" ) // BuildClientAssertionJWT makes a JWT to be included in an OIDC auth request. diff --git a/lib/auth/oidc/client_assertion_test.go b/lib/auth/oidc/client_assertion_test.go index 2f4e46f827a..615d45f1370 100644 --- a/lib/auth/oidc/client_assertion_test.go +++ b/lib/auth/oidc/client_assertion_test.go @@ -15,7 +15,7 @@ import ( "testing" "time" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/nomad/structs" "github.com/shoenig/test/must" ) diff --git a/lib/auth/oidc/provider.go b/lib/auth/oidc/provider.go index 34ca8f6257c..9e8196b8480 100644 --- a/lib/auth/oidc/provider.go +++ b/lib/auth/oidc/provider.go @@ -10,7 +10,7 @@ import ( "time" "github.com/hashicorp/cap/oidc" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/nomad/structs" ) // providerConfig returns the OIDC provider configuration for an OIDC diff --git a/lib/auth/oidc/provider_test.go b/lib/auth/oidc/provider_test.go index 31407e88d38..9a3cfc34eda 100644 --- a/lib/auth/oidc/provider_test.go +++ b/lib/auth/oidc/provider_test.go @@ -8,7 +8,7 @@ import ( "time" "github.com/hashicorp/cap/oidc" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/nomad/structs" "github.com/shoenig/test/must" ) diff --git a/lib/delayheap/delay_heap.go b/lib/delayheap/delay_heap.go index f04ace82c05..f8d0ba867a1 100644 --- a/lib/delayheap/delay_heap.go +++ b/lib/delayheap/delay_heap.go @@ -8,7 +8,7 @@ import ( "fmt" "time" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/nomad/structs" ) // DelayHeap wraps a heap and gives operations other than Push/Pop. diff --git a/lib/delayheap/delay_heap_test.go b/lib/delayheap/delay_heap_test.go index 1d287b945b8..b18c1efbc48 100644 --- a/lib/delayheap/delay_heap_test.go +++ b/lib/delayheap/delay_heap_test.go @@ -7,7 +7,7 @@ import ( "testing" "time" - "github.com/hashicorp/nomad/ci" + "github.com/hashicorp/nomad/v2/ci" "github.com/stretchr/testify/require" ) diff --git a/lib/kheap/score_heap_test.go b/lib/kheap/score_heap_test.go index c3ff802d87a..4921da4e6e0 100644 --- a/lib/kheap/score_heap_test.go +++ b/lib/kheap/score_heap_test.go @@ -7,7 +7,7 @@ import ( "container/heap" "testing" - "github.com/hashicorp/nomad/ci" + "github.com/hashicorp/nomad/v2/ci" "github.com/stretchr/testify/require" ) diff --git a/lib/lang/maps.go b/lib/lang/maps.go index 96652c52f15..ce9bdab4b17 100644 --- a/lib/lang/maps.go +++ b/lib/lang/maps.go @@ -7,7 +7,7 @@ import ( "cmp" "slices" - "github.com/hashicorp/nomad/helper/pointer" + "github.com/hashicorp/nomad/v2/helper/pointer" ) // MapKeys will return a slice of keys of m in no particular order. diff --git a/main.go b/main.go index 81423c402c6..f3abdac3047 100644 --- a/main.go +++ b/main.go @@ -16,16 +16,16 @@ import ( // into their command logic. This is because they are run as separate // processes along side of a task. By early importing them we can avoid // additional code being imported and thus reserving memory. - _ "github.com/hashicorp/nomad/client/allocrunner/taskrunner/getter" - _ "github.com/hashicorp/nomad/client/allocrunner/taskrunner/template/renderer" - _ "github.com/hashicorp/nomad/client/logmon" - _ "github.com/hashicorp/nomad/drivers/docker/docklog" - _ "github.com/hashicorp/nomad/drivers/shared/executor" + _ "github.com/hashicorp/nomad/v2/client/allocrunner/taskrunner/getter" + _ "github.com/hashicorp/nomad/v2/client/allocrunner/taskrunner/template/renderer" + _ "github.com/hashicorp/nomad/v2/client/logmon" + _ "github.com/hashicorp/nomad/v2/drivers/docker/docklog" + _ "github.com/hashicorp/nomad/v2/drivers/shared/executor" // Don't move any other code imports above the import block above! "github.com/hashicorp/cli" - "github.com/hashicorp/nomad/command" - "github.com/hashicorp/nomad/version" + "github.com/hashicorp/nomad/v2/command" + "github.com/hashicorp/nomad/v2/version" ) var ( diff --git a/nomad/acl.go b/nomad/acl.go index 2e57ebfb17d..c8cf944f706 100644 --- a/nomad/acl.go +++ b/nomad/acl.go @@ -4,8 +4,8 @@ package nomad import ( - "github.com/hashicorp/nomad/acl" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/acl" + "github.com/hashicorp/nomad/v2/nomad/structs" ) func (s *Server) Authenticate(ctx *RPCContext, args structs.RequestWithIdentity) error { diff --git a/nomad/acl_endpoint.go b/nomad/acl_endpoint.go index 5c049f95001..5225f7feb28 100644 --- a/nomad/acl_endpoint.go +++ b/nomad/acl_endpoint.go @@ -20,17 +20,17 @@ import ( "github.com/hashicorp/go-memdb" metrics "github.com/hashicorp/go-metrics/compat" "github.com/hashicorp/go-set/v3" - "github.com/hashicorp/nomad/acl" - policy "github.com/hashicorp/nomad/acl" - "github.com/hashicorp/nomad/helper" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/lib/auth" - "github.com/hashicorp/nomad/lib/auth/jwt" - "github.com/hashicorp/nomad/lib/auth/oidc" - "github.com/hashicorp/nomad/nomad/peers" - "github.com/hashicorp/nomad/nomad/state" - "github.com/hashicorp/nomad/nomad/state/paginator" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/acl" + policy "github.com/hashicorp/nomad/v2/acl" + "github.com/hashicorp/nomad/v2/helper" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/lib/auth" + "github.com/hashicorp/nomad/v2/lib/auth/jwt" + "github.com/hashicorp/nomad/v2/lib/auth/oidc" + "github.com/hashicorp/nomad/v2/nomad/peers" + "github.com/hashicorp/nomad/v2/nomad/state" + "github.com/hashicorp/nomad/v2/nomad/state/paginator" + "github.com/hashicorp/nomad/v2/nomad/structs" ) var ( diff --git a/nomad/acl_endpoint_test.go b/nomad/acl_endpoint_test.go index c96e5ec9a16..acc3a8b17b5 100644 --- a/nomad/acl_endpoint_test.go +++ b/nomad/acl_endpoint_test.go @@ -19,12 +19,12 @@ import ( "github.com/hashicorp/go-hclog" "github.com/hashicorp/go-memdb" msgpackrpc "github.com/hashicorp/net-rpc-msgpackrpc/v2" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/lib/auth/oidc" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/testutil" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/lib/auth/oidc" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/testutil" "github.com/shoenig/test/must" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/nomad/acl_test.go b/nomad/acl_test.go index aae3fd2136a..7deb63738b2 100644 --- a/nomad/acl_test.go +++ b/nomad/acl_test.go @@ -10,12 +10,12 @@ import ( "time" msgpackrpc "github.com/hashicorp/net-rpc-msgpackrpc/v2" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/nomad/structs/config" - "github.com/hashicorp/nomad/testutil" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/nomad/structs/config" + "github.com/hashicorp/nomad/v2/testutil" "github.com/shoenig/test" "github.com/shoenig/test/must" ) diff --git a/nomad/alloc_endpoint.go b/nomad/alloc_endpoint.go index 77f1d6e22e2..a9c3eb67652 100644 --- a/nomad/alloc_endpoint.go +++ b/nomad/alloc_endpoint.go @@ -12,11 +12,11 @@ import ( "github.com/hashicorp/go-memdb" metrics "github.com/hashicorp/go-metrics/compat" - "github.com/hashicorp/nomad/acl" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/nomad/state" - "github.com/hashicorp/nomad/nomad/state/paginator" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/acl" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/nomad/state" + "github.com/hashicorp/nomad/v2/nomad/state/paginator" + "github.com/hashicorp/nomad/v2/nomad/structs" ) // Alloc endpoint is used for manipulating allocations diff --git a/nomad/alloc_endpoint_test.go b/nomad/alloc_endpoint_test.go index 3c710c2b31a..0b3ffe88cdb 100644 --- a/nomad/alloc_endpoint_test.go +++ b/nomad/alloc_endpoint_test.go @@ -9,12 +9,12 @@ import ( "time" msgpackrpc "github.com/hashicorp/net-rpc-msgpackrpc/v2" - "github.com/hashicorp/nomad/acl" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/testutil" + "github.com/hashicorp/nomad/v2/acl" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/testutil" "github.com/shoenig/test/must" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/nomad/auth/auth.go b/nomad/auth/auth.go index a0ffd888676..bba2cd2b533 100644 --- a/nomad/auth/auth.go +++ b/nomad/auth/auth.go @@ -15,10 +15,10 @@ import ( "github.com/hashicorp/go-hclog" metrics "github.com/hashicorp/go-metrics/compat" - "github.com/hashicorp/nomad/acl" - "github.com/hashicorp/nomad/helper" - "github.com/hashicorp/nomad/nomad/state" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/acl" + "github.com/hashicorp/nomad/v2/helper" + "github.com/hashicorp/nomad/v2/nomad/state" + "github.com/hashicorp/nomad/v2/nomad/structs" ) // aclCacheSize is the number of ACL objects to keep cached. ACLs have a parsing diff --git a/nomad/auth/auth_test.go b/nomad/auth/auth_test.go index 319fb148cc8..162afda8409 100644 --- a/nomad/auth/auth_test.go +++ b/nomad/auth/auth_test.go @@ -19,13 +19,13 @@ import ( "github.com/go-jose/go-jose/v3/jwt" "github.com/shoenig/test/must" - "github.com/hashicorp/nomad/acl" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/helper/testlog" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/state" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/acl" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/helper/testlog" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/state" + "github.com/hashicorp/nomad/v2/nomad/structs" ) func TestAuthenticateDefault(t *testing.T) { diff --git a/nomad/autopilot.go b/nomad/autopilot.go index 5e869bc462e..4c0db6a4aaf 100644 --- a/nomad/autopilot.go +++ b/nomad/autopilot.go @@ -8,9 +8,9 @@ import ( "fmt" metrics "github.com/hashicorp/go-metrics/compat" - "github.com/hashicorp/nomad/helper" - "github.com/hashicorp/nomad/nomad/peers" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/helper" + "github.com/hashicorp/nomad/v2/nomad/peers" + "github.com/hashicorp/nomad/v2/nomad/structs" "github.com/hashicorp/raft" autopilot "github.com/hashicorp/raft-autopilot" "github.com/hashicorp/serf/serf" diff --git a/nomad/autopilot_ce.go b/nomad/autopilot_ce.go index e9f525dc9f0..12385d982c2 100644 --- a/nomad/autopilot_ce.go +++ b/nomad/autopilot_ce.go @@ -9,8 +9,8 @@ package nomad import ( autopilot "github.com/hashicorp/raft-autopilot" - "github.com/hashicorp/nomad/nomad/peers" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/nomad/peers" + "github.com/hashicorp/nomad/v2/nomad/structs" ) func (s *Server) autopilotPromoter() autopilot.Promoter { diff --git a/nomad/autopilot_test.go b/nomad/autopilot_test.go index f7a0de105c0..fa2b6d5cafa 100644 --- a/nomad/autopilot_test.go +++ b/nomad/autopilot_test.go @@ -13,9 +13,9 @@ import ( "github.com/hashicorp/serf/serf" "github.com/shoenig/test/must" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/testutil" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/testutil" ) var _ autopilot.ApplicationIntegration = (*AutopilotDelegate)(nil) diff --git a/nomad/blocked_evals.go b/nomad/blocked_evals.go index b3a395990bf..7e30407459d 100644 --- a/nomad/blocked_evals.go +++ b/nomad/blocked_evals.go @@ -9,8 +9,8 @@ import ( "github.com/hashicorp/go-hclog" metrics "github.com/hashicorp/go-metrics/compat" - "github.com/hashicorp/nomad/helper" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/helper" + "github.com/hashicorp/nomad/v2/nomad/structs" ) const ( diff --git a/nomad/blocked_evals_stats.go b/nomad/blocked_evals_stats.go index 32d28e9ec00..e4c840b8aa3 100644 --- a/nomad/blocked_evals_stats.go +++ b/nomad/blocked_evals_stats.go @@ -7,7 +7,7 @@ import ( "sync" "time" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/nomad/structs" ) // BlockedStats returns all the stats about the blocked eval tracker. diff --git a/nomad/blocked_evals_stats_test.go b/nomad/blocked_evals_stats_test.go index 2968d6a03a6..41c0d73a1e4 100644 --- a/nomad/blocked_evals_stats_test.go +++ b/nomad/blocked_evals_stats_test.go @@ -11,9 +11,9 @@ import ( "testing/quick" "time" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" "github.com/stretchr/testify/require" ) diff --git a/nomad/blocked_evals_system.go b/nomad/blocked_evals_system.go index 11c8349e45a..a4c0d82d1a9 100644 --- a/nomad/blocked_evals_system.go +++ b/nomad/blocked_evals_system.go @@ -3,7 +3,7 @@ package nomad -import "github.com/hashicorp/nomad/nomad/structs" +import "github.com/hashicorp/nomad/v2/nomad/structs" // systemEvals are handled specially, each job may have a blocked eval on each node type systemEvals struct { diff --git a/nomad/blocked_evals_test.go b/nomad/blocked_evals_test.go index 1b8dce93b3c..1e199ed368b 100644 --- a/nomad/blocked_evals_test.go +++ b/nomad/blocked_evals_test.go @@ -10,10 +10,10 @@ import ( "testing" "time" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/helper/testlog" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/helper/testlog" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" "github.com/shoenig/test/must" "github.com/shoenig/test/wait" ) diff --git a/nomad/client_agent_endpoint.go b/nomad/client_agent_endpoint.go index aaca6e64c1f..808eefe2e15 100644 --- a/nomad/client_agent_endpoint.go +++ b/nomad/client_agent_endpoint.go @@ -14,13 +14,13 @@ import ( log "github.com/hashicorp/go-hclog" "github.com/hashicorp/go-msgpack/v2/codec" - sframer "github.com/hashicorp/nomad/client/lib/streamframer" - cstructs "github.com/hashicorp/nomad/client/structs" - "github.com/hashicorp/nomad/command/agent/host" - "github.com/hashicorp/nomad/command/agent/monitor" - "github.com/hashicorp/nomad/command/agent/pprof" - "github.com/hashicorp/nomad/nomad/peers" - "github.com/hashicorp/nomad/nomad/structs" + sframer "github.com/hashicorp/nomad/v2/client/lib/streamframer" + cstructs "github.com/hashicorp/nomad/v2/client/structs" + "github.com/hashicorp/nomad/v2/command/agent/host" + "github.com/hashicorp/nomad/v2/command/agent/monitor" + "github.com/hashicorp/nomad/v2/command/agent/pprof" + "github.com/hashicorp/nomad/v2/nomad/peers" + "github.com/hashicorp/nomad/v2/nomad/structs" ) type Agent struct { diff --git a/nomad/client_agent_endpoint_test.go b/nomad/client_agent_endpoint_test.go index 88d2277fcad..1e6a03f7675 100644 --- a/nomad/client_agent_endpoint_test.go +++ b/nomad/client_agent_endpoint_test.go @@ -16,18 +16,18 @@ import ( "github.com/hashicorp/go-hclog" "github.com/hashicorp/go-msgpack/v2/codec" - "github.com/hashicorp/nomad/acl" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/client" - "github.com/hashicorp/nomad/client/config" - sframer "github.com/hashicorp/nomad/client/lib/streamframer" - cstructs "github.com/hashicorp/nomad/client/structs" - "github.com/hashicorp/nomad/command/agent/monitor" - "github.com/hashicorp/nomad/command/agent/pprof" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/testutil" + "github.com/hashicorp/nomad/v2/acl" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/client" + "github.com/hashicorp/nomad/v2/client/config" + sframer "github.com/hashicorp/nomad/v2/client/lib/streamframer" + cstructs "github.com/hashicorp/nomad/v2/client/structs" + "github.com/hashicorp/nomad/v2/command/agent/monitor" + "github.com/hashicorp/nomad/v2/command/agent/pprof" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/testutil" "github.com/shoenig/test/must" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/nomad/client_alloc_endpoint.go b/nomad/client_alloc_endpoint.go index f93755bfd0d..e1fe1c87542 100644 --- a/nomad/client_alloc_endpoint.go +++ b/nomad/client_alloc_endpoint.go @@ -15,9 +15,9 @@ import ( metrics "github.com/hashicorp/go-metrics/compat" "github.com/hashicorp/go-msgpack/v2/codec" - "github.com/hashicorp/nomad/acl" - cstructs "github.com/hashicorp/nomad/client/structs" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/acl" + cstructs "github.com/hashicorp/nomad/v2/client/structs" + "github.com/hashicorp/nomad/v2/nomad/structs" ) // ClientAllocations is used to forward RPC requests to the targeted Nomad client's diff --git a/nomad/client_alloc_endpoint_test.go b/nomad/client_alloc_endpoint_test.go index 71617833f12..e3147e008ef 100644 --- a/nomad/client_alloc_endpoint_test.go +++ b/nomad/client_alloc_endpoint_test.go @@ -14,16 +14,16 @@ import ( "github.com/hashicorp/go-msgpack/v2/codec" msgpackrpc "github.com/hashicorp/net-rpc-msgpackrpc/v2" - "github.com/hashicorp/nomad/acl" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/client" - "github.com/hashicorp/nomad/client/config" - cstructs "github.com/hashicorp/nomad/client/structs" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/nomad/mock" - nstructs "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/plugins/drivers" - "github.com/hashicorp/nomad/testutil" + "github.com/hashicorp/nomad/v2/acl" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/client" + "github.com/hashicorp/nomad/v2/client/config" + cstructs "github.com/hashicorp/nomad/v2/client/structs" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/nomad/mock" + nstructs "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/plugins/drivers" + "github.com/hashicorp/nomad/v2/testutil" "github.com/kr/pretty" "github.com/shoenig/test/must" "github.com/stretchr/testify/require" diff --git a/nomad/client_csi_endpoint.go b/nomad/client_csi_endpoint.go index 2cd76434f28..4c829cc69f6 100644 --- a/nomad/client_csi_endpoint.go +++ b/nomad/client_csi_endpoint.go @@ -14,8 +14,8 @@ import ( memdb "github.com/hashicorp/go-memdb" metrics "github.com/hashicorp/go-metrics/compat" - cstructs "github.com/hashicorp/nomad/client/structs" - "github.com/hashicorp/nomad/nomad/structs" + cstructs "github.com/hashicorp/nomad/v2/client/structs" + "github.com/hashicorp/nomad/v2/nomad/structs" ) // ClientCSI is used to forward RPC requests to the targed Nomad client's diff --git a/nomad/client_csi_endpoint_test.go b/nomad/client_csi_endpoint_test.go index e99f426b2f5..5285e36cac7 100644 --- a/nomad/client_csi_endpoint_test.go +++ b/nomad/client_csi_endpoint_test.go @@ -11,14 +11,14 @@ import ( memdb "github.com/hashicorp/go-memdb" msgpackrpc "github.com/hashicorp/net-rpc-msgpackrpc/v2" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/client" - "github.com/hashicorp/nomad/client/config" - cstructs "github.com/hashicorp/nomad/client/structs" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/testutil" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/client" + "github.com/hashicorp/nomad/v2/client/config" + cstructs "github.com/hashicorp/nomad/v2/client/structs" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/testutil" "github.com/shoenig/test/must" ) diff --git a/nomad/client_fs_endpoint.go b/nomad/client_fs_endpoint.go index eb1d529cd23..593e1b02011 100644 --- a/nomad/client_fs_endpoint.go +++ b/nomad/client_fs_endpoint.go @@ -13,11 +13,11 @@ import ( log "github.com/hashicorp/go-hclog" metrics "github.com/hashicorp/go-metrics/compat" - cstructs "github.com/hashicorp/nomad/client/structs" + cstructs "github.com/hashicorp/nomad/v2/client/structs" "github.com/hashicorp/go-msgpack/v2/codec" - "github.com/hashicorp/nomad/acl" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/acl" + "github.com/hashicorp/nomad/v2/nomad/structs" ) // FileSystem endpoint is used for accessing the logs and filesystem of diff --git a/nomad/client_fs_endpoint_test.go b/nomad/client_fs_endpoint_test.go index 1b797e6ace9..729b2f7ab30 100644 --- a/nomad/client_fs_endpoint_test.go +++ b/nomad/client_fs_endpoint_test.go @@ -13,15 +13,15 @@ import ( codec "github.com/hashicorp/go-msgpack/v2/codec" msgpackrpc "github.com/hashicorp/net-rpc-msgpackrpc/v2" - "github.com/hashicorp/nomad/acl" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/client" - "github.com/hashicorp/nomad/client/config" - cstructs "github.com/hashicorp/nomad/client/structs" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/testutil" + "github.com/hashicorp/nomad/v2/acl" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/client" + "github.com/hashicorp/nomad/v2/client/config" + cstructs "github.com/hashicorp/nomad/v2/client/structs" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/testutil" "github.com/shoenig/test/must" "github.com/stretchr/testify/require" ) diff --git a/nomad/client_host_volume_endpoint.go b/nomad/client_host_volume_endpoint.go index 8a62fecf9cd..ae7ce0b02cb 100644 --- a/nomad/client_host_volume_endpoint.go +++ b/nomad/client_host_volume_endpoint.go @@ -9,8 +9,8 @@ import ( log "github.com/hashicorp/go-hclog" metrics "github.com/hashicorp/go-metrics/compat" - cstructs "github.com/hashicorp/nomad/client/structs" - "github.com/hashicorp/nomad/nomad/structs" + cstructs "github.com/hashicorp/nomad/v2/client/structs" + "github.com/hashicorp/nomad/v2/nomad/structs" ) // ClientHostVolume is the client RPC endpoint for host volumes diff --git a/nomad/client_identity_endpoint.go b/nomad/client_identity_endpoint.go index b027a61a838..1b4bfd928c7 100644 --- a/nomad/client_identity_endpoint.go +++ b/nomad/client_identity_endpoint.go @@ -7,7 +7,7 @@ import ( "time" metrics "github.com/hashicorp/go-metrics/compat" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/nomad/structs" ) type NodeIdentity struct { diff --git a/nomad/client_identity_endpoint_test.go b/nomad/client_identity_endpoint_test.go index 38363549632..6e0185644de 100644 --- a/nomad/client_identity_endpoint_test.go +++ b/nomad/client_identity_endpoint_test.go @@ -6,11 +6,11 @@ package nomad import ( "testing" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/client" - "github.com/hashicorp/nomad/client/config" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/testutil" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/client" + "github.com/hashicorp/nomad/v2/client/config" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/testutil" "github.com/shoenig/test/must" ) diff --git a/nomad/client_meta_endpoint.go b/nomad/client_meta_endpoint.go index ecabd340bb1..a5fa63fa8d4 100644 --- a/nomad/client_meta_endpoint.go +++ b/nomad/client_meta_endpoint.go @@ -8,8 +8,8 @@ import ( log "github.com/hashicorp/go-hclog" metrics "github.com/hashicorp/go-metrics/compat" - "github.com/hashicorp/nomad/nomad/structs" - nstructs "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/nomad/structs" + nstructs "github.com/hashicorp/nomad/v2/nomad/structs" ) type NodeMeta struct { diff --git a/nomad/client_meta_endpoint_test.go b/nomad/client_meta_endpoint_test.go index 7260026622b..38fbc644038 100644 --- a/nomad/client_meta_endpoint_test.go +++ b/nomad/client_meta_endpoint_test.go @@ -6,11 +6,11 @@ package nomad import ( "testing" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/client" - "github.com/hashicorp/nomad/client/config" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/testutil" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/client" + "github.com/hashicorp/nomad/v2/client/config" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/testutil" "github.com/shoenig/test/must" ) diff --git a/nomad/client_rpc.go b/nomad/client_rpc.go index 7ab3b6aa742..1a85400af89 100644 --- a/nomad/client_rpc.go +++ b/nomad/client_rpc.go @@ -12,9 +12,9 @@ import ( "github.com/hashicorp/go-msgpack/v2/codec" multierror "github.com/hashicorp/go-multierror" msgpackrpc "github.com/hashicorp/net-rpc-msgpackrpc/v2" - "github.com/hashicorp/nomad/helper/pool" - "github.com/hashicorp/nomad/nomad/peers" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/helper/pool" + "github.com/hashicorp/nomad/v2/nomad/peers" + "github.com/hashicorp/nomad/v2/nomad/structs" "github.com/hashicorp/yamux" ) diff --git a/nomad/client_rpc_test.go b/nomad/client_rpc_test.go index 60d6785bf02..f8f7efa7e9e 100644 --- a/nomad/client_rpc_test.go +++ b/nomad/client_rpc_test.go @@ -8,12 +8,12 @@ import ( "strings" "testing" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/client" - "github.com/hashicorp/nomad/client/config" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/testutil" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/client" + "github.com/hashicorp/nomad/v2/client/config" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/testutil" "github.com/stretchr/testify/require" ) diff --git a/nomad/client_stats_endpoint.go b/nomad/client_stats_endpoint.go index aadf57c27fe..df29efa05d1 100644 --- a/nomad/client_stats_endpoint.go +++ b/nomad/client_stats_endpoint.go @@ -8,9 +8,9 @@ import ( log "github.com/hashicorp/go-hclog" metrics "github.com/hashicorp/go-metrics/compat" - nstructs "github.com/hashicorp/nomad/nomad/structs" + nstructs "github.com/hashicorp/nomad/v2/nomad/structs" - "github.com/hashicorp/nomad/client/structs" + "github.com/hashicorp/nomad/v2/client/structs" ) // ClientStats is used to forward RPC requests to the targed Nomad client's diff --git a/nomad/client_stats_endpoint_test.go b/nomad/client_stats_endpoint_test.go index 451d133665c..fc1af09b91a 100644 --- a/nomad/client_stats_endpoint_test.go +++ b/nomad/client_stats_endpoint_test.go @@ -8,15 +8,15 @@ import ( "time" msgpackrpc "github.com/hashicorp/net-rpc-msgpackrpc/v2" - "github.com/hashicorp/nomad/acl" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/client" - "github.com/hashicorp/nomad/client/config" - cstructs "github.com/hashicorp/nomad/client/structs" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/testutil" + "github.com/hashicorp/nomad/v2/acl" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/client" + "github.com/hashicorp/nomad/v2/client/config" + cstructs "github.com/hashicorp/nomad/v2/client/structs" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/testutil" "github.com/stretchr/testify/require" ) diff --git a/nomad/config.go b/nomad/config.go index 8926733fbb0..9d3a8318f20 100644 --- a/nomad/config.go +++ b/nomad/config.go @@ -14,13 +14,13 @@ import ( log "github.com/hashicorp/go-hclog" "github.com/hashicorp/memberlist" - "github.com/hashicorp/nomad/helper" - "github.com/hashicorp/nomad/helper/pointer" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/nomad/deploymentwatcher" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/nomad/structs/config" - "github.com/hashicorp/nomad/scheduler" + "github.com/hashicorp/nomad/v2/helper" + "github.com/hashicorp/nomad/v2/helper/pointer" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/nomad/deploymentwatcher" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/nomad/structs/config" + "github.com/hashicorp/nomad/v2/scheduler" "github.com/hashicorp/raft" "github.com/hashicorp/serf/serf" "github.com/hashicorp/yamux" diff --git a/nomad/consul.go b/nomad/consul.go index 2ee56eeba5a..7c06e28ee94 100644 --- a/nomad/consul.go +++ b/nomad/consul.go @@ -14,8 +14,8 @@ import ( "github.com/hashicorp/consul/api" "github.com/hashicorp/go-hclog" metrics "github.com/hashicorp/go-metrics/compat" - "github.com/hashicorp/nomad/command/agent/consul" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/command/agent/consul" + "github.com/hashicorp/nomad/v2/nomad/structs" "golang.org/x/time/rate" ) diff --git a/nomad/consul_test.go b/nomad/consul_test.go index 0cb5481d059..b41d3fa11f3 100644 --- a/nomad/consul_test.go +++ b/nomad/consul_test.go @@ -9,10 +9,10 @@ import ( "testing" "github.com/hashicorp/consul/api" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/command/agent/consul" - "github.com/hashicorp/nomad/helper/testlog" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/command/agent/consul" + "github.com/hashicorp/nomad/v2/helper/testlog" + "github.com/hashicorp/nomad/v2/nomad/structs" "github.com/shoenig/test/must" ) diff --git a/nomad/core_sched.go b/nomad/core_sched.go index 6cfeae4b38a..6bae857d358 100644 --- a/nomad/core_sched.go +++ b/nomad/core_sched.go @@ -14,10 +14,10 @@ import ( log "github.com/hashicorp/go-hclog" memdb "github.com/hashicorp/go-memdb" version "github.com/hashicorp/go-version" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/nomad/state" - "github.com/hashicorp/nomad/nomad/structs" - sstructs "github.com/hashicorp/nomad/scheduler/structs" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/nomad/state" + "github.com/hashicorp/nomad/v2/nomad/structs" + sstructs "github.com/hashicorp/nomad/v2/scheduler/structs" "golang.org/x/time/rate" ) diff --git a/nomad/core_sched_test.go b/nomad/core_sched_test.go index f4bf64cb5ef..504e35cab83 100644 --- a/nomad/core_sched_test.go +++ b/nomad/core_sched_test.go @@ -13,13 +13,13 @@ import ( memdb "github.com/hashicorp/go-memdb" version "github.com/hashicorp/go-version" msgpackrpc "github.com/hashicorp/net-rpc-msgpackrpc/v2" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/state" - "github.com/hashicorp/nomad/nomad/structs" - sstructs "github.com/hashicorp/nomad/scheduler/structs" - "github.com/hashicorp/nomad/testutil" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/state" + "github.com/hashicorp/nomad/v2/nomad/structs" + sstructs "github.com/hashicorp/nomad/v2/scheduler/structs" + "github.com/hashicorp/nomad/v2/testutil" "github.com/shoenig/test/must" "github.com/shoenig/test/wait" "github.com/stretchr/testify/assert" diff --git a/nomad/csi_endpoint.go b/nomad/csi_endpoint.go index 07c27ea6e74..30e9cee0092 100644 --- a/nomad/csi_endpoint.go +++ b/nomad/csi_endpoint.go @@ -17,12 +17,12 @@ import ( metrics "github.com/hashicorp/go-metrics/compat" "github.com/hashicorp/go-multierror" - "github.com/hashicorp/nomad/acl" - cstructs "github.com/hashicorp/nomad/client/structs" - "github.com/hashicorp/nomad/nomad/state" - "github.com/hashicorp/nomad/nomad/state/paginator" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/plugins/csi" + "github.com/hashicorp/nomad/v2/acl" + cstructs "github.com/hashicorp/nomad/v2/client/structs" + "github.com/hashicorp/nomad/v2/nomad/state" + "github.com/hashicorp/nomad/v2/nomad/state/paginator" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/plugins/csi" ) // CSIVolume wraps the structs.CSIVolume with request data and server context diff --git a/nomad/csi_endpoint_ce.go b/nomad/csi_endpoint_ce.go index 4e76274879e..d4f7c83b85f 100644 --- a/nomad/csi_endpoint_ce.go +++ b/nomad/csi_endpoint_ce.go @@ -7,8 +7,8 @@ package nomad import ( - "github.com/hashicorp/nomad/nomad/state" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/nomad/state" + "github.com/hashicorp/nomad/v2/nomad/structs" ) func (v *CSIVolume) enforceEnterprisePolicy(_ *state.StateSnapshot, _ *structs.CSIVolume, _ *structs.CSIVolume, _ *structs.ACLToken, _ bool) (error, error) { diff --git a/nomad/csi_endpoint_test.go b/nomad/csi_endpoint_test.go index 5c73a28704d..9e73010e2b4 100644 --- a/nomad/csi_endpoint_test.go +++ b/nomad/csi_endpoint_test.go @@ -17,18 +17,18 @@ import ( "github.com/shoenig/test/must" "github.com/stretchr/testify/require" - "github.com/hashicorp/nomad/acl" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/client" - cconfig "github.com/hashicorp/nomad/client/config" - cstructs "github.com/hashicorp/nomad/client/structs" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/lib/lang" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/state" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/plugins/csi" - "github.com/hashicorp/nomad/testutil" + "github.com/hashicorp/nomad/v2/acl" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/client" + cconfig "github.com/hashicorp/nomad/v2/client/config" + cstructs "github.com/hashicorp/nomad/v2/client/structs" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/lib/lang" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/state" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/plugins/csi" + "github.com/hashicorp/nomad/v2/testutil" ) func TestCSIVolumeEndpoint_Get(t *testing.T) { diff --git a/nomad/deployment_endpoint.go b/nomad/deployment_endpoint.go index fcdbbd6091d..7fb52dda3ab 100644 --- a/nomad/deployment_endpoint.go +++ b/nomad/deployment_endpoint.go @@ -12,10 +12,10 @@ import ( "github.com/hashicorp/go-memdb" metrics "github.com/hashicorp/go-metrics/compat" - "github.com/hashicorp/nomad/acl" - "github.com/hashicorp/nomad/nomad/state" - "github.com/hashicorp/nomad/nomad/state/paginator" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/acl" + "github.com/hashicorp/nomad/v2/nomad/state" + "github.com/hashicorp/nomad/v2/nomad/state/paginator" + "github.com/hashicorp/nomad/v2/nomad/structs" ) // Deployment endpoint is used for manipulating deployments diff --git a/nomad/deployment_endpoint_test.go b/nomad/deployment_endpoint_test.go index d4367deaa2f..6aa14f11063 100644 --- a/nomad/deployment_endpoint_test.go +++ b/nomad/deployment_endpoint_test.go @@ -9,12 +9,12 @@ import ( memdb "github.com/hashicorp/go-memdb" msgpackrpc "github.com/hashicorp/net-rpc-msgpackrpc/v2" - "github.com/hashicorp/nomad/acl" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/testutil" + "github.com/hashicorp/nomad/v2/acl" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/testutil" "github.com/shoenig/test/must" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/nomad/deployment_watcher_shims.go b/nomad/deployment_watcher_shims.go index 4e731adf392..626637e7a30 100644 --- a/nomad/deployment_watcher_shims.go +++ b/nomad/deployment_watcher_shims.go @@ -4,7 +4,7 @@ package nomad import ( - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/nomad/structs" ) // deploymentWatcherRaftShim is the shim that provides the state watching diff --git a/nomad/deploymentwatcher/batcher.go b/nomad/deploymentwatcher/batcher.go index 89c5afc9ed9..a242c7c262c 100644 --- a/nomad/deploymentwatcher/batcher.go +++ b/nomad/deploymentwatcher/batcher.go @@ -7,7 +7,7 @@ import ( "context" "time" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/nomad/structs" ) // AllocUpdateBatcher is used to batch the updates to the desired transitions diff --git a/nomad/deploymentwatcher/deployment_watcher.go b/nomad/deploymentwatcher/deployment_watcher.go index 33405f83264..2f0b8e8cfdc 100644 --- a/nomad/deploymentwatcher/deployment_watcher.go +++ b/nomad/deploymentwatcher/deployment_watcher.go @@ -11,9 +11,9 @@ import ( log "github.com/hashicorp/go-hclog" memdb "github.com/hashicorp/go-memdb" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/nomad/state" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/nomad/state" + "github.com/hashicorp/nomad/v2/nomad/structs" "golang.org/x/time/rate" ) diff --git a/nomad/deploymentwatcher/deployments_watcher.go b/nomad/deploymentwatcher/deployments_watcher.go index a9d43ff0b50..f51f10f3492 100644 --- a/nomad/deploymentwatcher/deployments_watcher.go +++ b/nomad/deploymentwatcher/deployments_watcher.go @@ -14,8 +14,8 @@ import ( log "github.com/hashicorp/go-hclog" memdb "github.com/hashicorp/go-memdb" - "github.com/hashicorp/nomad/nomad/state" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/nomad/state" + "github.com/hashicorp/nomad/v2/nomad/structs" ) const ( diff --git a/nomad/deploymentwatcher/deployments_watcher_test.go b/nomad/deploymentwatcher/deployments_watcher_test.go index 65d57714a1b..587a41ab57b 100644 --- a/nomad/deploymentwatcher/deployments_watcher_test.go +++ b/nomad/deploymentwatcher/deployments_watcher_test.go @@ -13,12 +13,12 @@ import ( "github.com/hashicorp/go-hclog" "github.com/hashicorp/go-memdb" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/helper/testlog" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/state" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/helper/testlog" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/state" + "github.com/hashicorp/nomad/v2/nomad/structs" "github.com/shoenig/test" "github.com/shoenig/test/must" "github.com/shoenig/test/wait" diff --git a/nomad/deploymentwatcher/multiregion_ce.go b/nomad/deploymentwatcher/multiregion_ce.go index 10ac3212fb3..c7bd71e2e5f 100644 --- a/nomad/deploymentwatcher/multiregion_ce.go +++ b/nomad/deploymentwatcher/multiregion_ce.go @@ -6,7 +6,7 @@ package deploymentwatcher -import "github.com/hashicorp/nomad/nomad/structs" +import "github.com/hashicorp/nomad/v2/nomad/structs" // DeploymentRPC and JobRPC hold methods for interacting with peer regions // in enterprise edition. diff --git a/nomad/deploymentwatcher/testutil_test.go b/nomad/deploymentwatcher/testutil_test.go index 9989c637603..17e4f6c1c8a 100644 --- a/nomad/deploymentwatcher/testutil_test.go +++ b/nomad/deploymentwatcher/testutil_test.go @@ -7,8 +7,8 @@ import ( "sync" "testing" - "github.com/hashicorp/nomad/nomad/state" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/nomad/state" + "github.com/hashicorp/nomad/v2/nomad/structs" "github.com/shoenig/test/must" ) diff --git a/nomad/drainer/drain_heap_test.go b/nomad/drainer/drain_heap_test.go index 9fcaa2f435b..fac9a4d26c5 100644 --- a/nomad/drainer/drain_heap_test.go +++ b/nomad/drainer/drain_heap_test.go @@ -8,8 +8,8 @@ import ( "testing" "time" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/testutil" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/testutil" "github.com/stretchr/testify/require" ) diff --git a/nomad/drainer/drain_testing.go b/nomad/drainer/drain_testing.go index 51f83a13aa4..dfda8d9757b 100644 --- a/nomad/drainer/drain_testing.go +++ b/nomad/drainer/drain_testing.go @@ -11,9 +11,9 @@ import ( "golang.org/x/time/rate" - "github.com/hashicorp/nomad/helper/testlog" - "github.com/hashicorp/nomad/nomad/state" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/helper/testlog" + "github.com/hashicorp/nomad/v2/nomad/state" + "github.com/hashicorp/nomad/v2/nomad/structs" ) // This file contains helpers for testing. The raft shims make it hard to test diff --git a/nomad/drainer/drainer.go b/nomad/drainer/drainer.go index 87f49afd0de..465990da2c3 100644 --- a/nomad/drainer/drainer.go +++ b/nomad/drainer/drainer.go @@ -10,9 +10,9 @@ import ( log "github.com/hashicorp/go-hclog" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/nomad/state" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/nomad/state" + "github.com/hashicorp/nomad/v2/nomad/structs" "golang.org/x/time/rate" ) diff --git a/nomad/drainer/drainer_util.go b/nomad/drainer/drainer_util.go index 4adf1aaf320..88cd13f5c63 100644 --- a/nomad/drainer/drainer_util.go +++ b/nomad/drainer/drainer_util.go @@ -4,7 +4,7 @@ package drainer import ( - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/nomad/structs" ) const ( diff --git a/nomad/drainer/drainer_util_test.go b/nomad/drainer/drainer_util_test.go index 18813352142..f0d1993f313 100644 --- a/nomad/drainer/drainer_util_test.go +++ b/nomad/drainer/drainer_util_test.go @@ -6,8 +6,8 @@ package drainer import ( "testing" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/nomad/structs" "github.com/stretchr/testify/require" ) diff --git a/nomad/drainer/draining_node.go b/nomad/drainer/draining_node.go index bfc8b61c6aa..b53a27989e2 100644 --- a/nomad/drainer/draining_node.go +++ b/nomad/drainer/draining_node.go @@ -8,8 +8,8 @@ import ( "sync" "time" - "github.com/hashicorp/nomad/nomad/state" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/nomad/state" + "github.com/hashicorp/nomad/v2/nomad/structs" ) type drainingNode struct { diff --git a/nomad/drainer/draining_node_test.go b/nomad/drainer/draining_node_test.go index 411d29bc06a..b7c9560fc39 100644 --- a/nomad/drainer/draining_node_test.go +++ b/nomad/drainer/draining_node_test.go @@ -7,10 +7,10 @@ import ( "testing" "time" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/state" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/state" + "github.com/hashicorp/nomad/v2/nomad/structs" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/nomad/drainer/watch_jobs.go b/nomad/drainer/watch_jobs.go index 81ba330e0f0..a27296b8741 100644 --- a/nomad/drainer/watch_jobs.go +++ b/nomad/drainer/watch_jobs.go @@ -11,9 +11,9 @@ import ( log "github.com/hashicorp/go-hclog" memdb "github.com/hashicorp/go-memdb" - "github.com/hashicorp/nomad/helper" - "github.com/hashicorp/nomad/nomad/state" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/helper" + "github.com/hashicorp/nomad/v2/nomad/state" + "github.com/hashicorp/nomad/v2/nomad/structs" "golang.org/x/time/rate" ) diff --git a/nomad/drainer/watch_jobs_test.go b/nomad/drainer/watch_jobs_test.go index 36969a65bdd..488ca8df9d1 100644 --- a/nomad/drainer/watch_jobs_test.go +++ b/nomad/drainer/watch_jobs_test.go @@ -13,12 +13,12 @@ import ( "github.com/stretchr/testify/require" "golang.org/x/time/rate" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/helper/testlog" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/state" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/helper/testlog" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/state" + "github.com/hashicorp/nomad/v2/nomad/structs" ) func testNodes(t *testing.T, state *state.StateStore) (drainingNode, runningNode *structs.Node) { diff --git a/nomad/drainer/watch_nodes.go b/nomad/drainer/watch_nodes.go index b403cb8162c..afe6286b269 100644 --- a/nomad/drainer/watch_nodes.go +++ b/nomad/drainer/watch_nodes.go @@ -8,10 +8,10 @@ import ( log "github.com/hashicorp/go-hclog" memdb "github.com/hashicorp/go-memdb" - "github.com/hashicorp/nomad/helper" + "github.com/hashicorp/nomad/v2/helper" - "github.com/hashicorp/nomad/nomad/state" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/nomad/state" + "github.com/hashicorp/nomad/v2/nomad/structs" "golang.org/x/time/rate" ) diff --git a/nomad/drainer/watch_nodes_test.go b/nomad/drainer/watch_nodes_test.go index ec734f2de03..8705b1a845c 100644 --- a/nomad/drainer/watch_nodes_test.go +++ b/nomad/drainer/watch_nodes_test.go @@ -11,11 +11,11 @@ import ( "github.com/shoenig/test/must" "github.com/shoenig/test/wait" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/state" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/state" + "github.com/hashicorp/nomad/v2/nomad/structs" ) // TestNodeDrainWatcher_AddNodes tests that new nodes are added to the node diff --git a/nomad/drainer_int_test.go b/nomad/drainer_int_test.go index 20ff80fc72a..50a26921cdd 100644 --- a/nomad/drainer_int_test.go +++ b/nomad/drainer_int_test.go @@ -15,13 +15,13 @@ import ( "github.com/shoenig/test/must" "github.com/shoenig/test/wait" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/nomad/drainer" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/state" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/testutil" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/nomad/drainer" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/state" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/testutil" ) // allocClientStateSimulator simulates the updates in state from the diff --git a/nomad/drainer_shims.go b/nomad/drainer_shims.go index d77c26df653..09be4afbba7 100644 --- a/nomad/drainer_shims.go +++ b/nomad/drainer_shims.go @@ -6,7 +6,7 @@ package nomad import ( "time" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/nomad/structs" ) // drainerShim implements the drainer.RaftApplier interface required by the diff --git a/nomad/encrypter.go b/nomad/encrypter.go index 2f6d51d6ac3..2567863a66f 100644 --- a/nomad/encrypter.go +++ b/nomad/encrypter.go @@ -30,11 +30,11 @@ import ( "github.com/hashicorp/go-kms-wrapping/wrappers/gcpckms/v2" "github.com/hashicorp/go-kms-wrapping/wrappers/transit/v2" "github.com/hashicorp/go-multierror" - "github.com/hashicorp/nomad/helper" - "github.com/hashicorp/nomad/helper/crypto" - "github.com/hashicorp/nomad/helper/joseutil" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/nomad/structs/config" + "github.com/hashicorp/nomad/v2/helper" + "github.com/hashicorp/nomad/v2/helper/crypto" + "github.com/hashicorp/nomad/v2/helper/joseutil" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/nomad/structs/config" "github.com/hashicorp/raft" "golang.org/x/time/rate" ) diff --git a/nomad/encrypter_ce.go b/nomad/encrypter_ce.go index 3227ac838fa..1df930ce905 100644 --- a/nomad/encrypter_ce.go +++ b/nomad/encrypter_ce.go @@ -9,7 +9,7 @@ package nomad import ( "fmt" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/nomad/structs" ) func getProviderConfigs(srv *Server) (map[string]*structs.KEKProviderConfig, error) { diff --git a/nomad/encrypter_test.go b/nomad/encrypter_test.go index 6889ee69f48..ff19b8e5193 100644 --- a/nomad/encrypter_test.go +++ b/nomad/encrypter_test.go @@ -24,15 +24,15 @@ import ( "github.com/go-jose/go-jose/v3/jwt" wrapping "github.com/hashicorp/go-kms-wrapping/v2" msgpackrpc "github.com/hashicorp/net-rpc-msgpackrpc/v2" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/helper" - "github.com/hashicorp/nomad/helper/testlog" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/nomad/auth" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/nomad/structs/config" - "github.com/hashicorp/nomad/testutil" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/helper" + "github.com/hashicorp/nomad/v2/helper/testlog" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/nomad/auth" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/nomad/structs/config" + "github.com/hashicorp/nomad/v2/testutil" "github.com/shoenig/test" "github.com/shoenig/test/must" "github.com/shoenig/test/wait" diff --git a/nomad/eval_broker.go b/nomad/eval_broker.go index e02583427db..c81a0be34a5 100644 --- a/nomad/eval_broker.go +++ b/nomad/eval_broker.go @@ -15,11 +15,11 @@ import ( metrics "github.com/hashicorp/go-metrics/compat" - "github.com/hashicorp/nomad/helper" - "github.com/hashicorp/nomad/helper/broker" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/lib/delayheap" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/helper" + "github.com/hashicorp/nomad/v2/helper/broker" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/lib/delayheap" + "github.com/hashicorp/nomad/v2/nomad/structs" ) const ( diff --git a/nomad/eval_broker_test.go b/nomad/eval_broker_test.go index 3e2a3945264..881c0132af8 100644 --- a/nomad/eval_broker_test.go +++ b/nomad/eval_broker_test.go @@ -18,11 +18,11 @@ import ( "github.com/shoenig/test/wait" "github.com/stretchr/testify/require" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/state" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/testutil" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/state" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/testutil" ) var ( diff --git a/nomad/eval_endpoint.go b/nomad/eval_endpoint.go index f1776200fc0..3b1776e6943 100644 --- a/nomad/eval_endpoint.go +++ b/nomad/eval_endpoint.go @@ -16,11 +16,11 @@ import ( "github.com/hashicorp/go-multierror" "github.com/hashicorp/go-version" - "github.com/hashicorp/nomad/acl" - "github.com/hashicorp/nomad/nomad/state" - "github.com/hashicorp/nomad/nomad/state/paginator" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/scheduler" + "github.com/hashicorp/nomad/v2/acl" + "github.com/hashicorp/nomad/v2/nomad/state" + "github.com/hashicorp/nomad/v2/nomad/state/paginator" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/scheduler" ) const ( diff --git a/nomad/eval_endpoint_test.go b/nomad/eval_endpoint_test.go index e88d9686fb3..99b6c38cb15 100644 --- a/nomad/eval_endpoint_test.go +++ b/nomad/eval_endpoint_test.go @@ -13,13 +13,13 @@ import ( memdb "github.com/hashicorp/go-memdb" "github.com/hashicorp/go-set/v3" msgpackrpc "github.com/hashicorp/net-rpc-msgpackrpc/v2" - "github.com/hashicorp/nomad/acl" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/scheduler" - "github.com/hashicorp/nomad/testutil" + "github.com/hashicorp/nomad/v2/acl" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/scheduler" + "github.com/hashicorp/nomad/v2/testutil" "github.com/shoenig/test/must" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/nomad/event_endpoint.go b/nomad/event_endpoint.go index 623253528c7..f95f1b9b3de 100644 --- a/nomad/event_endpoint.go +++ b/nomad/event_endpoint.go @@ -11,10 +11,10 @@ import ( "github.com/hashicorp/go-msgpack/v2/codec" - "github.com/hashicorp/nomad/acl" - "github.com/hashicorp/nomad/nomad/peers" - "github.com/hashicorp/nomad/nomad/stream" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/acl" + "github.com/hashicorp/nomad/v2/nomad/peers" + "github.com/hashicorp/nomad/v2/nomad/stream" + "github.com/hashicorp/nomad/v2/nomad/structs" ) type Event struct { diff --git a/nomad/event_endpoint_test.go b/nomad/event_endpoint_test.go index 6b9ed9c5eca..cb672505710 100644 --- a/nomad/event_endpoint_test.go +++ b/nomad/event_endpoint_test.go @@ -17,12 +17,12 @@ import ( "github.com/go-viper/mapstructure/v2" "github.com/hashicorp/go-msgpack/v2/codec" msgpackrpc "github.com/hashicorp/net-rpc-msgpackrpc/v2" - "github.com/hashicorp/nomad/acl" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/stream" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/testutil" + "github.com/hashicorp/nomad/v2/acl" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/stream" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/testutil" "github.com/shoenig/test/must" "github.com/stretchr/testify/require" ) diff --git a/nomad/fsm.go b/nomad/fsm.go index 3a43d2a691f..d3ed8dd72f4 100644 --- a/nomad/fsm.go +++ b/nomad/fsm.go @@ -16,11 +16,11 @@ import ( "github.com/hashicorp/go-memdb" metrics "github.com/hashicorp/go-metrics/compat" "github.com/hashicorp/go-msgpack/v2/codec" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/nomad/state" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/scheduler" - sstructs "github.com/hashicorp/nomad/scheduler/structs" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/nomad/state" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/scheduler" + sstructs "github.com/hashicorp/nomad/v2/scheduler/structs" "github.com/hashicorp/raft" ) diff --git a/nomad/fsm_test.go b/nomad/fsm_test.go index ae841b8a890..19d6fc6f896 100644 --- a/nomad/fsm_test.go +++ b/nomad/fsm_test.go @@ -22,14 +22,14 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/helper/testlog" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/state" - "github.com/hashicorp/nomad/nomad/stream" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/testutil" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/helper/testlog" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/state" + "github.com/hashicorp/nomad/v2/nomad/stream" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/testutil" ) type MockSink struct { diff --git a/nomad/heartbeat.go b/nomad/heartbeat.go index 423c0210153..abb737aef65 100644 --- a/nomad/heartbeat.go +++ b/nomad/heartbeat.go @@ -12,8 +12,8 @@ import ( memdb "github.com/hashicorp/go-memdb" metrics "github.com/hashicorp/go-metrics/compat" - "github.com/hashicorp/nomad/helper" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/helper" + "github.com/hashicorp/nomad/v2/nomad/structs" ) const ( diff --git a/nomad/heartbeat_test.go b/nomad/heartbeat_test.go index 0880df200d6..0741d1d4c6b 100644 --- a/nomad/heartbeat_test.go +++ b/nomad/heartbeat_test.go @@ -11,11 +11,11 @@ import ( "github.com/hashicorp/go-hclog" memdb "github.com/hashicorp/go-memdb" msgpackrpc "github.com/hashicorp/net-rpc-msgpackrpc/v2" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/testutil" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/testutil" "github.com/shoenig/test/must" "github.com/stretchr/testify/require" ) diff --git a/nomad/host_volume_endpoint.go b/nomad/host_volume_endpoint.go index 276f411f9c3..ca9dd211fea 100644 --- a/nomad/host_volume_endpoint.go +++ b/nomad/host_volume_endpoint.go @@ -16,13 +16,13 @@ import ( "github.com/hashicorp/go-hclog" "github.com/hashicorp/go-memdb" metrics "github.com/hashicorp/go-metrics/compat" - "github.com/hashicorp/nomad/acl" - cstructs "github.com/hashicorp/nomad/client/structs" - "github.com/hashicorp/nomad/helper" - "github.com/hashicorp/nomad/nomad/state" - "github.com/hashicorp/nomad/nomad/state/paginator" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/scheduler/feasible" + "github.com/hashicorp/nomad/v2/acl" + cstructs "github.com/hashicorp/nomad/v2/client/structs" + "github.com/hashicorp/nomad/v2/helper" + "github.com/hashicorp/nomad/v2/nomad/state" + "github.com/hashicorp/nomad/v2/nomad/state/paginator" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/scheduler/feasible" ) // HostVolume is the server RPC endpoint for host volumes diff --git a/nomad/host_volume_endpoint_ce.go b/nomad/host_volume_endpoint_ce.go index 3cdc5294d34..bfc992ac227 100644 --- a/nomad/host_volume_endpoint_ce.go +++ b/nomad/host_volume_endpoint_ce.go @@ -7,8 +7,8 @@ package nomad import ( - "github.com/hashicorp/nomad/nomad/state" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/nomad/state" + "github.com/hashicorp/nomad/v2/nomad/structs" ) // enforceEnterprisePolicy is the CE stub for Enterprise governance via diff --git a/nomad/host_volume_endpoint_test.go b/nomad/host_volume_endpoint_test.go index 8e5aec9d6e8..37ed194ffe2 100644 --- a/nomad/host_volume_endpoint_test.go +++ b/nomad/host_volume_endpoint_test.go @@ -14,17 +14,17 @@ import ( "github.com/hashicorp/go-multierror" "github.com/hashicorp/go-set/v3" msgpackrpc "github.com/hashicorp/net-rpc-msgpackrpc/v2" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/client" - "github.com/hashicorp/nomad/client/config" - cstructs "github.com/hashicorp/nomad/client/structs" - "github.com/hashicorp/nomad/helper" - "github.com/hashicorp/nomad/helper/testlog" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/testutil" - "github.com/hashicorp/nomad/version" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/client" + "github.com/hashicorp/nomad/v2/client/config" + cstructs "github.com/hashicorp/nomad/v2/client/structs" + "github.com/hashicorp/nomad/v2/helper" + "github.com/hashicorp/nomad/v2/helper/testlog" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/testutil" + "github.com/hashicorp/nomad/v2/version" "github.com/shoenig/test" "github.com/shoenig/test/must" "github.com/shoenig/test/wait" diff --git a/nomad/job_endpoint.go b/nomad/job_endpoint.go index 0ab70316a76..e89c18ca520 100644 --- a/nomad/job_endpoint.go +++ b/nomad/job_endpoint.go @@ -18,14 +18,14 @@ import ( metrics "github.com/hashicorp/go-metrics/compat" "github.com/hashicorp/go-multierror" "github.com/hashicorp/go-set/v3" - "github.com/hashicorp/nomad/acl" - "github.com/hashicorp/nomad/helper" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/nomad/state" - "github.com/hashicorp/nomad/nomad/state/paginator" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/scheduler" - sstructs "github.com/hashicorp/nomad/scheduler/structs" + "github.com/hashicorp/nomad/v2/acl" + "github.com/hashicorp/nomad/v2/helper" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/nomad/state" + "github.com/hashicorp/nomad/v2/nomad/state/paginator" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/scheduler" + sstructs "github.com/hashicorp/nomad/v2/scheduler/structs" ) const ( diff --git a/nomad/job_endpoint_ce.go b/nomad/job_endpoint_ce.go index b89c6d6dade..a74c994fa6a 100644 --- a/nomad/job_endpoint_ce.go +++ b/nomad/job_endpoint_ce.go @@ -7,7 +7,7 @@ package nomad import ( - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/nomad/structs" ) // enforceSubmitJob is used to check any Sentinel policies for the submit-job scope diff --git a/nomad/job_endpoint_ce_test.go b/nomad/job_endpoint_ce_test.go index 9df9ec9e30b..50d00ede7f0 100644 --- a/nomad/job_endpoint_ce_test.go +++ b/nomad/job_endpoint_ce_test.go @@ -10,10 +10,10 @@ import ( "testing" msgpackrpc "github.com/hashicorp/net-rpc-msgpackrpc/v2" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/testutil" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/testutil" "github.com/shoenig/test/must" ) diff --git a/nomad/job_endpoint_hook_connect.go b/nomad/job_endpoint_hook_connect.go index e6d0ccda9b1..c81f702cae8 100644 --- a/nomad/job_endpoint_hook_connect.go +++ b/nomad/job_endpoint_hook_connect.go @@ -12,10 +12,10 @@ import ( "time" "github.com/hashicorp/go-set/v3" - "github.com/hashicorp/nomad/client/taskenv" - "github.com/hashicorp/nomad/helper/envoy" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/client/taskenv" + "github.com/hashicorp/nomad/v2/helper/envoy" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/nomad/structs" ) const ( diff --git a/nomad/job_endpoint_hook_connect_test.go b/nomad/job_endpoint_hook_connect_test.go index 462616a5259..7ac111531e3 100644 --- a/nomad/job_endpoint_hook_connect_test.go +++ b/nomad/job_endpoint_hook_connect_test.go @@ -8,11 +8,11 @@ import ( "testing" "time" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/helper" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/testutil" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/helper" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/testutil" "github.com/shoenig/test/must" "github.com/stretchr/testify/require" ) diff --git a/nomad/job_endpoint_hook_consul.go b/nomad/job_endpoint_hook_consul.go index 28342b30bd5..6b8f9b72a97 100644 --- a/nomad/job_endpoint_hook_consul.go +++ b/nomad/job_endpoint_hook_consul.go @@ -6,7 +6,7 @@ package nomad import ( "fmt" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/nomad/structs" ) // jobConsulHook is a job registration admission controller for Consul diff --git a/nomad/job_endpoint_hook_consul_ce.go b/nomad/job_endpoint_hook_consul_ce.go index 9516cc057c6..d888607a4e1 100644 --- a/nomad/job_endpoint_hook_consul_ce.go +++ b/nomad/job_endpoint_hook_consul_ce.go @@ -9,7 +9,7 @@ package nomad import ( "errors" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/nomad/structs" ) func (h jobConsulHook) Validate(job *structs.Job) ([]error, error) { diff --git a/nomad/job_endpoint_hook_consul_ce_test.go b/nomad/job_endpoint_hook_consul_ce_test.go index fb28b0289c1..cd6b870163e 100644 --- a/nomad/job_endpoint_hook_consul_ce_test.go +++ b/nomad/job_endpoint_hook_consul_ce_test.go @@ -9,10 +9,10 @@ package nomad import ( "testing" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/testutil" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/testutil" "github.com/shoenig/test" "github.com/shoenig/test/must" ) diff --git a/nomad/job_endpoint_hook_expose_check.go b/nomad/job_endpoint_hook_expose_check.go index f153a32346d..8299a76020a 100644 --- a/nomad/job_endpoint_hook_expose_check.go +++ b/nomad/job_endpoint_hook_expose_check.go @@ -8,7 +8,7 @@ import ( "strconv" "strings" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/nomad/structs" ) type jobExposeCheckHook struct{} diff --git a/nomad/job_endpoint_hook_expose_check_test.go b/nomad/job_endpoint_hook_expose_check_test.go index c25d1196dd8..6af4f7da927 100644 --- a/nomad/job_endpoint_hook_expose_check_test.go +++ b/nomad/job_endpoint_hook_expose_check_test.go @@ -6,8 +6,8 @@ package nomad import ( "testing" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/nomad/structs" "github.com/shoenig/test/must" "github.com/stretchr/testify/require" ) diff --git a/nomad/job_endpoint_hook_implicit_identities.go b/nomad/job_endpoint_hook_implicit_identities.go index 0bc2749a4d2..f59a61e10a5 100644 --- a/nomad/job_endpoint_hook_implicit_identities.go +++ b/nomad/job_endpoint_hook_implicit_identities.go @@ -4,7 +4,7 @@ package nomad import ( - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/nomad/structs" ) // jobImplicitIdentitiesHook adds implicit `identity` blocks for external diff --git a/nomad/job_endpoint_hook_implicit_identities_test.go b/nomad/job_endpoint_hook_implicit_identities_test.go index a237b6d4a83..1230a9ac2b4 100644 --- a/nomad/job_endpoint_hook_implicit_identities_test.go +++ b/nomad/job_endpoint_hook_implicit_identities_test.go @@ -6,9 +6,9 @@ package nomad import ( "testing" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/nomad/structs/config" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/nomad/structs/config" "github.com/shoenig/test/must" ) diff --git a/nomad/job_endpoint_hook_node_pool.go b/nomad/job_endpoint_hook_node_pool.go index d9d5ff4a4e4..55d3654c8a0 100644 --- a/nomad/job_endpoint_hook_node_pool.go +++ b/nomad/job_endpoint_hook_node_pool.go @@ -6,7 +6,7 @@ package nomad import ( "fmt" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/nomad/structs" ) // jobNodePoolValidatingHook is an admission hook that ensures the job has valid diff --git a/nomad/job_endpoint_hook_node_pool_ce.go b/nomad/job_endpoint_hook_node_pool_ce.go index abe61720504..c9274af0b2d 100644 --- a/nomad/job_endpoint_hook_node_pool_ce.go +++ b/nomad/job_endpoint_hook_node_pool_ce.go @@ -6,7 +6,7 @@ package nomad -import "github.com/hashicorp/nomad/nomad/structs" +import "github.com/hashicorp/nomad/v2/nomad/structs" // enterpriseValidation implements any admission hooks for node pools for Nomad // Enterprise. diff --git a/nomad/job_endpoint_hook_numa_ce.go b/nomad/job_endpoint_hook_numa_ce.go index 4666b4a070c..5a39cb9e24f 100644 --- a/nomad/job_endpoint_hook_numa_ce.go +++ b/nomad/job_endpoint_hook_numa_ce.go @@ -8,7 +8,7 @@ package nomad import ( "errors" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/nomad/structs" ) // Validate ensures job does not contain any task making use of the diff --git a/nomad/job_endpoint_hook_numa_ce_test.go b/nomad/job_endpoint_hook_numa_ce_test.go index 552b2c5302f..dd7332354de 100644 --- a/nomad/job_endpoint_hook_numa_ce_test.go +++ b/nomad/job_endpoint_hook_numa_ce_test.go @@ -8,9 +8,9 @@ package nomad import ( "testing" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" "github.com/shoenig/test/must" ) diff --git a/nomad/job_endpoint_hook_sched_ce.go b/nomad/job_endpoint_hook_sched_ce.go index 0558c66710b..c4eedca34f1 100644 --- a/nomad/job_endpoint_hook_sched_ce.go +++ b/nomad/job_endpoint_hook_sched_ce.go @@ -8,7 +8,7 @@ package nomad import ( "errors" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/nomad/structs" ) func (jobSchedHook) Validate(job *structs.Job) ([]error, error) { diff --git a/nomad/job_endpoint_hook_vault.go b/nomad/job_endpoint_hook_vault.go index b0c2dfdf0ad..ab694ce35bc 100644 --- a/nomad/job_endpoint_hook_vault.go +++ b/nomad/job_endpoint_hook_vault.go @@ -6,7 +6,7 @@ package nomad import ( "fmt" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/nomad/structs" ) // jobVaultHook is an job registration admission controller for Vault blocks. diff --git a/nomad/job_endpoint_hook_vault_ce.go b/nomad/job_endpoint_hook_vault_ce.go index 3191dbe210e..3085e0e0cd2 100644 --- a/nomad/job_endpoint_hook_vault_ce.go +++ b/nomad/job_endpoint_hook_vault_ce.go @@ -10,7 +10,7 @@ import ( "fmt" "strings" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/nomad/structs" ) // validateNamespaces returns an error if the job contains any Vault namespaces. diff --git a/nomad/job_endpoint_hook_vault_ce_test.go b/nomad/job_endpoint_hook_vault_ce_test.go index b12ff2482fb..2307c7bd25e 100644 --- a/nomad/job_endpoint_hook_vault_ce_test.go +++ b/nomad/job_endpoint_hook_vault_ce_test.go @@ -9,11 +9,11 @@ package nomad import ( "testing" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/nomad/structs/config" - "github.com/hashicorp/nomad/testutil" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/nomad/structs/config" + "github.com/hashicorp/nomad/v2/testutil" "github.com/shoenig/test/must" ) diff --git a/nomad/job_endpoint_hooks.go b/nomad/job_endpoint_hooks.go index cc52eba1f2f..1ed5eb76d92 100644 --- a/nomad/job_endpoint_hooks.go +++ b/nomad/job_endpoint_hooks.go @@ -10,9 +10,9 @@ import ( "github.com/dustin/go-humanize" "github.com/hashicorp/go-multierror" - "github.com/hashicorp/nomad/helper" - "github.com/hashicorp/nomad/lib/lang" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/helper" + "github.com/hashicorp/nomad/v2/lib/lang" + "github.com/hashicorp/nomad/v2/nomad/structs" ) // Node attributes acquired via fingerprinting. diff --git a/nomad/job_endpoint_hooks_test.go b/nomad/job_endpoint_hooks_test.go index 1be39cf64a4..6785bab345c 100644 --- a/nomad/job_endpoint_hooks_test.go +++ b/nomad/job_endpoint_hooks_test.go @@ -8,10 +8,10 @@ import ( "testing" "time" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/nomad/structs/config" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/nomad/structs/config" "github.com/shoenig/test/must" ) diff --git a/nomad/job_endpoint_statuses.go b/nomad/job_endpoint_statuses.go index 7b8c7079dbc..63f082951b9 100644 --- a/nomad/job_endpoint_statuses.go +++ b/nomad/job_endpoint_statuses.go @@ -11,10 +11,10 @@ import ( "github.com/hashicorp/go-memdb" metrics "github.com/hashicorp/go-metrics/compat" "github.com/hashicorp/go-set/v3" - "github.com/hashicorp/nomad/acl" - "github.com/hashicorp/nomad/nomad/state" - "github.com/hashicorp/nomad/nomad/state/paginator" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/acl" + "github.com/hashicorp/nomad/v2/nomad/state" + "github.com/hashicorp/nomad/v2/nomad/state/paginator" + "github.com/hashicorp/nomad/v2/nomad/structs" ) // Statuses looks up info about jobs, their allocs, and latest deployment. diff --git a/nomad/job_endpoint_statuses_test.go b/nomad/job_endpoint_statuses_test.go index 8844b6c59d6..6319916fe99 100644 --- a/nomad/job_endpoint_statuses_test.go +++ b/nomad/job_endpoint_statuses_test.go @@ -9,9 +9,9 @@ import ( "testing" "time" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/testutil" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/testutil" "github.com/shoenig/test" "github.com/shoenig/test/must" ) diff --git a/nomad/job_endpoint_test.go b/nomad/job_endpoint_test.go index aeafcbd8c5f..84e76a4af0f 100644 --- a/nomad/job_endpoint_test.go +++ b/nomad/job_endpoint_test.go @@ -16,16 +16,16 @@ import ( "github.com/hashicorp/go-memdb" msgpackrpc "github.com/hashicorp/net-rpc-msgpackrpc/v2" - "github.com/hashicorp/nomad/acl" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/client/lib/idset" - "github.com/hashicorp/nomad/client/lib/numalib" - "github.com/hashicorp/nomad/client/lib/numalib/hw" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/testutil" - nomadVersion "github.com/hashicorp/nomad/version" + "github.com/hashicorp/nomad/v2/acl" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/client/lib/idset" + "github.com/hashicorp/nomad/v2/client/lib/numalib" + "github.com/hashicorp/nomad/v2/client/lib/numalib/hw" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/testutil" + nomadVersion "github.com/hashicorp/nomad/v2/version" "github.com/hashicorp/raft" "github.com/kr/pretty" "github.com/shoenig/test/must" diff --git a/nomad/job_endpoint_validators.go b/nomad/job_endpoint_validators.go index 4a6f314a3e7..cce3bcbf5d8 100644 --- a/nomad/job_endpoint_validators.go +++ b/nomad/job_endpoint_validators.go @@ -6,7 +6,7 @@ package nomad import ( "fmt" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/nomad/structs" ) type jobNamespaceConstraintCheckHook struct { diff --git a/nomad/job_endpoint_validators_test.go b/nomad/job_endpoint_validators_test.go index 039010aa489..bc9f91f398d 100644 --- a/nomad/job_endpoint_validators_test.go +++ b/nomad/job_endpoint_validators_test.go @@ -6,10 +6,10 @@ package nomad import ( "testing" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/testutil" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/testutil" "github.com/shoenig/test/must" "github.com/stretchr/testify/require" ) diff --git a/nomad/keyring_endpoint.go b/nomad/keyring_endpoint.go index f2313071efa..35e941aa3a3 100644 --- a/nomad/keyring_endpoint.go +++ b/nomad/keyring_endpoint.go @@ -12,10 +12,10 @@ import ( "github.com/hashicorp/go-memdb" metrics "github.com/hashicorp/go-metrics/compat" - "github.com/hashicorp/nomad/acl" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/nomad/state" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/acl" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/nomad/state" + "github.com/hashicorp/nomad/v2/nomad/structs" ) // Keyring endpoint serves RPCs for root key management diff --git a/nomad/keyring_endpoint_test.go b/nomad/keyring_endpoint_test.go index 2bb0f4bcc2b..9074573ac5c 100644 --- a/nomad/keyring_endpoint_test.go +++ b/nomad/keyring_endpoint_test.go @@ -8,10 +8,10 @@ import ( "time" msgpackrpc "github.com/hashicorp/net-rpc-msgpackrpc/v2" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/testutil" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/testutil" "github.com/shoenig/test/must" ) diff --git a/nomad/leader.go b/nomad/leader.go index a7d77c1e9dd..26042401600 100644 --- a/nomad/leader.go +++ b/nomad/leader.go @@ -17,11 +17,11 @@ import ( "github.com/hashicorp/go-memdb" metrics "github.com/hashicorp/go-metrics/compat" "github.com/hashicorp/go-version" - "github.com/hashicorp/nomad/helper" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/nomad/peers" - "github.com/hashicorp/nomad/nomad/state" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/helper" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/nomad/peers" + "github.com/hashicorp/nomad/v2/nomad/state" + "github.com/hashicorp/nomad/v2/nomad/structs" "github.com/hashicorp/raft" "github.com/hashicorp/serf/serf" "golang.org/x/time/rate" diff --git a/nomad/leader_ce.go b/nomad/leader_ce.go index a4989507631..f068772d58b 100644 --- a/nomad/leader_ce.go +++ b/nomad/leader_ce.go @@ -6,7 +6,7 @@ package nomad -import "github.com/hashicorp/nomad/nomad/structs" +import "github.com/hashicorp/nomad/v2/nomad/structs" // establishEnterpriseLeadership is a no-op on OSS. func (s *Server) establishEnterpriseLeadership(stopCh chan struct{}, clusterMD structs.ClusterMetadata) error { diff --git a/nomad/leader_test.go b/nomad/leader_test.go index 42586ce262a..e6984bace16 100644 --- a/nomad/leader_test.go +++ b/nomad/leader_test.go @@ -20,12 +20,12 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/helper" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/state" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/testutil" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/helper" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/state" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/testutil" "github.com/hashicorp/raft" "github.com/hashicorp/serf/serf" ) diff --git a/nomad/lock/delay.go b/nomad/lock/delay.go index 965adb99afe..fc84487b43d 100644 --- a/nomad/lock/delay.go +++ b/nomad/lock/delay.go @@ -8,7 +8,7 @@ import ( "time" metrics "github.com/hashicorp/go-metrics/compat" - "github.com/hashicorp/nomad/helper" + "github.com/hashicorp/nomad/v2/helper" ) // DelayTimer is used to mark certain locks as unacquirable. When a locks TTL diff --git a/nomad/lock/delay_test.go b/nomad/lock/delay_test.go index cb543e16f66..d5a3813486e 100644 --- a/nomad/lock/delay_test.go +++ b/nomad/lock/delay_test.go @@ -7,7 +7,7 @@ import ( "testing" "time" - "github.com/hashicorp/nomad/ci" + "github.com/hashicorp/nomad/v2/ci" "github.com/shoenig/test/must" ) diff --git a/nomad/lock/ttl.go b/nomad/lock/ttl.go index b4b3eecf3cd..431631f16b6 100644 --- a/nomad/lock/ttl.go +++ b/nomad/lock/ttl.go @@ -8,7 +8,7 @@ import ( "time" metrics "github.com/hashicorp/go-metrics/compat" - "github.com/hashicorp/nomad/helper" + "github.com/hashicorp/nomad/v2/helper" ) // TTLTimer provides a map of named timers which is safe for concurrent use. diff --git a/nomad/lock/ttl_test.go b/nomad/lock/ttl_test.go index 663efbdfc0d..a1715cfd459 100644 --- a/nomad/lock/ttl_test.go +++ b/nomad/lock/ttl_test.go @@ -7,7 +7,7 @@ import ( "testing" "time" - "github.com/hashicorp/nomad/ci" + "github.com/hashicorp/nomad/v2/ci" "github.com/shoenig/test/must" ) diff --git a/nomad/locks.go b/nomad/locks.go index 2b81d1993b9..9f01906ce05 100644 --- a/nomad/locks.go +++ b/nomad/locks.go @@ -8,7 +8,7 @@ import ( "fmt" "time" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/nomad/structs" ) var ( diff --git a/nomad/locks_test.go b/nomad/locks_test.go index 766fa8c2ab6..9631793d0fb 100644 --- a/nomad/locks_test.go +++ b/nomad/locks_test.go @@ -8,11 +8,11 @@ import ( "testing" "time" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/testutil" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/testutil" "github.com/shoenig/test/must" ) diff --git a/nomad/merge.go b/nomad/merge.go index c72f7c75efd..eed2fd57385 100644 --- a/nomad/merge.go +++ b/nomad/merge.go @@ -6,7 +6,7 @@ package nomad import ( "fmt" - "github.com/hashicorp/nomad/nomad/peers" + "github.com/hashicorp/nomad/v2/nomad/peers" "github.com/hashicorp/serf/serf" ) diff --git a/nomad/mock/acl.go b/nomad/mock/acl.go index 179952ad0bc..64bfeb8a5df 100644 --- a/nomad/mock/acl.go +++ b/nomad/mock/acl.go @@ -19,8 +19,8 @@ import ( "github.com/golang-jwt/jwt/v5" "github.com/stretchr/testify/assert" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/nomad/structs" ) // StateStore defines the methods required from state.StateStore but avoids a diff --git a/nomad/mock/alloc.go b/nomad/mock/alloc.go index caf35085646..16d1ab9805b 100644 --- a/nomad/mock/alloc.go +++ b/nomad/mock/alloc.go @@ -6,8 +6,8 @@ package mock import ( "math/rand" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/nomad/structs" ) func Alloc() *structs.Allocation { diff --git a/nomad/mock/connect.go b/nomad/mock/connect.go index def76513f67..a19b6f133a9 100644 --- a/nomad/mock/connect.go +++ b/nomad/mock/connect.go @@ -7,9 +7,9 @@ import ( "fmt" "time" - "github.com/hashicorp/nomad/helper/envoy" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/helper/envoy" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/nomad/structs" ) // ConnectJob adds a Connect proxy sidecar group service to mock.Job. diff --git a/nomad/mock/csi.go b/nomad/mock/csi.go index 52c05ee9afb..7ec612a4308 100644 --- a/nomad/mock/csi.go +++ b/nomad/mock/csi.go @@ -7,8 +7,8 @@ import ( "fmt" "time" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/nomad/structs" ) func CSIPlugin() *structs.CSIPlugin { diff --git a/nomad/mock/host_volumes.go b/nomad/mock/host_volumes.go index 8620a2226e9..477e565f9ec 100644 --- a/nomad/mock/host_volumes.go +++ b/nomad/mock/host_volumes.go @@ -4,8 +4,8 @@ package mock import ( - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/nomad/structs" ) func HostVolumeRequest(ns string) *structs.HostVolume { diff --git a/nomad/mock/job.go b/nomad/mock/job.go index 086a8b8713f..ce84b622722 100644 --- a/nomad/mock/job.go +++ b/nomad/mock/job.go @@ -7,8 +7,8 @@ import ( "fmt" "time" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/nomad/structs" ) func Job() *structs.Job { diff --git a/nomad/mock/lifecycle.go b/nomad/mock/lifecycle.go index 46992573b9a..0beddd8d5f2 100644 --- a/nomad/mock/lifecycle.go +++ b/nomad/mock/lifecycle.go @@ -7,8 +7,8 @@ import ( "fmt" "time" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/nomad/structs" ) func LifecycleSideTask(resources structs.Resources, i int) *structs.Task { diff --git a/nomad/mock/mock.go b/nomad/mock/mock.go index ab9fbb9e946..bba9bcaf8a7 100644 --- a/nomad/mock/mock.go +++ b/nomad/mock/mock.go @@ -7,8 +7,8 @@ import ( "fmt" "time" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/nomad/structs" ) func HCL() string { diff --git a/nomad/mock/network.go b/nomad/mock/network.go index dedace90dca..8ff6e674e28 100644 --- a/nomad/mock/network.go +++ b/nomad/mock/network.go @@ -4,7 +4,7 @@ package mock import ( - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/nomad/structs" ) // NetworkStatus is a mock implementation of structs.NetworkStatus diff --git a/nomad/mock/node.go b/nomad/mock/node.go index 2b2e88498c5..915b96b621e 100644 --- a/nomad/mock/node.go +++ b/nomad/mock/node.go @@ -4,9 +4,9 @@ package mock import ( - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/nomad/structs" - psstructs "github.com/hashicorp/nomad/plugins/shared/structs" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/nomad/structs" + psstructs "github.com/hashicorp/nomad/v2/plugins/shared/structs" ) func Node() *structs.Node { diff --git a/nomad/mock/variables.go b/nomad/mock/variables.go index c8da54bc63c..4823748ee3b 100644 --- a/nomad/mock/variables.go +++ b/nomad/mock/variables.go @@ -9,7 +9,7 @@ import ( "sort" "time" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/nomad/structs" ) type MockVariables map[string]*structs.VariableDecrypted diff --git a/nomad/namespace_endpoint.go b/nomad/namespace_endpoint.go index a8a556c9a4d..324f2e9a46d 100644 --- a/nomad/namespace_endpoint.go +++ b/nomad/namespace_endpoint.go @@ -11,8 +11,8 @@ import ( metrics "github.com/hashicorp/go-metrics/compat" "github.com/hashicorp/go-multierror" - "github.com/hashicorp/nomad/nomad/state" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/nomad/state" + "github.com/hashicorp/nomad/v2/nomad/structs" ) // Namespace endpoint is used for manipulating namespaces diff --git a/nomad/namespace_endpoint_test.go b/nomad/namespace_endpoint_test.go index 4b6487e8bd0..539dfff58ca 100644 --- a/nomad/namespace_endpoint_test.go +++ b/nomad/namespace_endpoint_test.go @@ -9,12 +9,12 @@ import ( "time" msgpackrpc "github.com/hashicorp/net-rpc-msgpackrpc/v2" - "github.com/hashicorp/nomad/acl" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/testutil" + "github.com/hashicorp/nomad/v2/acl" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/testutil" "github.com/shoenig/test/must" "github.com/stretchr/testify/assert" ) diff --git a/nomad/node_endpoint.go b/nomad/node_endpoint.go index 400ae409e06..62f73aae551 100644 --- a/nomad/node_endpoint.go +++ b/nomad/node_endpoint.go @@ -17,12 +17,12 @@ import ( metrics "github.com/hashicorp/go-metrics/compat" "github.com/hashicorp/go-multierror" - "github.com/hashicorp/nomad/acl" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/nomad/auth" - "github.com/hashicorp/nomad/nomad/state" - "github.com/hashicorp/nomad/nomad/state/paginator" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/acl" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/nomad/auth" + "github.com/hashicorp/nomad/v2/nomad/state" + "github.com/hashicorp/nomad/v2/nomad/state/paginator" + "github.com/hashicorp/nomad/v2/nomad/structs" ) const ( diff --git a/nomad/node_endpoint_test.go b/nomad/node_endpoint_test.go index 5a1f0c2c00a..dff6943d8b6 100644 --- a/nomad/node_endpoint_test.go +++ b/nomad/node_endpoint_test.go @@ -17,13 +17,13 @@ import ( "github.com/go-jose/go-jose/v3/jwt" memdb "github.com/hashicorp/go-memdb" msgpackrpc "github.com/hashicorp/net-rpc-msgpackrpc/v2" - "github.com/hashicorp/nomad/acl" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/state" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/testutil" + "github.com/hashicorp/nomad/v2/acl" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/state" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/testutil" "github.com/kr/pretty" "github.com/shoenig/test/must" "github.com/shoenig/test/wait" diff --git a/nomad/node_pool_endpoint.go b/nomad/node_pool_endpoint.go index 73ec957f84a..39b1c0c613b 100644 --- a/nomad/node_pool_endpoint.go +++ b/nomad/node_pool_endpoint.go @@ -12,10 +12,10 @@ import ( "github.com/hashicorp/go-memdb" metrics "github.com/hashicorp/go-metrics/compat" multierror "github.com/hashicorp/go-multierror" - "github.com/hashicorp/nomad/acl" - "github.com/hashicorp/nomad/nomad/state" - "github.com/hashicorp/nomad/nomad/state/paginator" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/acl" + "github.com/hashicorp/nomad/v2/nomad/state" + "github.com/hashicorp/nomad/v2/nomad/state/paginator" + "github.com/hashicorp/nomad/v2/nomad/structs" ) // NodePool endpoint is used for node pool management and interaction. diff --git a/nomad/node_pool_endpoint_ce.go b/nomad/node_pool_endpoint_ce.go index f4634c07d36..502e9167e5e 100644 --- a/nomad/node_pool_endpoint_ce.go +++ b/nomad/node_pool_endpoint_ce.go @@ -9,7 +9,7 @@ package nomad import ( "errors" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/nomad/structs" ) func (n *NodePool) validateLicense(pool *structs.NodePool) error { diff --git a/nomad/node_pool_endpoint_test.go b/nomad/node_pool_endpoint_test.go index 19e81952dfe..c4032b553da 100644 --- a/nomad/node_pool_endpoint_test.go +++ b/nomad/node_pool_endpoint_test.go @@ -12,11 +12,11 @@ import ( "github.com/hashicorp/go-memdb" "github.com/hashicorp/go-set/v3" msgpackrpc "github.com/hashicorp/net-rpc-msgpackrpc/v2" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/helper" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/testutil" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/helper" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/testutil" "github.com/shoenig/test/must" ) diff --git a/nomad/operator_endpoint.go b/nomad/operator_endpoint.go index 1facf90f58f..5a7bfde02b8 100644 --- a/nomad/operator_endpoint.go +++ b/nomad/operator_endpoint.go @@ -18,12 +18,12 @@ import ( "github.com/hashicorp/raft" "github.com/hashicorp/serf/serf" - "github.com/hashicorp/nomad/acl" - cstructs "github.com/hashicorp/nomad/client/structs" - "github.com/hashicorp/nomad/helper/snapshot" - "github.com/hashicorp/nomad/nomad/peers" - "github.com/hashicorp/nomad/nomad/state" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/acl" + cstructs "github.com/hashicorp/nomad/v2/client/structs" + "github.com/hashicorp/nomad/v2/helper/snapshot" + "github.com/hashicorp/nomad/v2/nomad/peers" + "github.com/hashicorp/nomad/v2/nomad/state" + "github.com/hashicorp/nomad/v2/nomad/structs" ) // Operator endpoint is used to perform low-level operator tasks for Nomad. diff --git a/nomad/operator_endpoint_test.go b/nomad/operator_endpoint_test.go index c7fe3fd9e45..3d3728ce7e0 100644 --- a/nomad/operator_endpoint_test.go +++ b/nomad/operator_endpoint_test.go @@ -19,14 +19,14 @@ import ( "github.com/hashicorp/go-msgpack/v2/codec" msgpackrpc "github.com/hashicorp/net-rpc-msgpackrpc/v2" - "github.com/hashicorp/nomad/acl" - "github.com/hashicorp/nomad/ci" - cstructs "github.com/hashicorp/nomad/client/structs" - "github.com/hashicorp/nomad/helper/snapshot" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/testutil" + "github.com/hashicorp/nomad/v2/acl" + "github.com/hashicorp/nomad/v2/ci" + cstructs "github.com/hashicorp/nomad/v2/client/structs" + "github.com/hashicorp/nomad/v2/helper/snapshot" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/testutil" "github.com/hashicorp/raft" "github.com/shoenig/test/must" "github.com/stretchr/testify/assert" diff --git a/nomad/peers/peers.go b/nomad/peers/peers.go index 43e93e4ed4c..76e7fb958bd 100644 --- a/nomad/peers/peers.go +++ b/nomad/peers/peers.go @@ -11,7 +11,7 @@ import ( "sync" "github.com/hashicorp/go-version" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/nomad/structs" "github.com/hashicorp/raft" "github.com/hashicorp/serf/serf" ) diff --git a/nomad/peers/peers_test.go b/nomad/peers/peers_test.go index e9b5db0bfd5..8f088827e61 100644 --- a/nomad/peers/peers_test.go +++ b/nomad/peers/peers_test.go @@ -11,9 +11,9 @@ import ( "testing" "github.com/hashicorp/go-version" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/nomad/structs" "github.com/hashicorp/raft" "github.com/hashicorp/serf/serf" "github.com/shoenig/test/must" diff --git a/nomad/periodic.go b/nomad/periodic.go index e35e9c6f990..0ddfc619725 100644 --- a/nomad/periodic.go +++ b/nomad/periodic.go @@ -14,10 +14,10 @@ import ( log "github.com/hashicorp/go-hclog" memdb "github.com/hashicorp/go-memdb" - "github.com/hashicorp/nomad/nomad/state" + "github.com/hashicorp/nomad/v2/nomad/state" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/nomad/structs" ) // PeriodicDispatch is used to track and launch periodic jobs. It maintains the diff --git a/nomad/periodic_endpoint.go b/nomad/periodic_endpoint.go index a04a7aaa786..4f207c7065e 100644 --- a/nomad/periodic_endpoint.go +++ b/nomad/periodic_endpoint.go @@ -11,8 +11,8 @@ import ( "github.com/hashicorp/go-memdb" metrics "github.com/hashicorp/go-metrics/compat" - "github.com/hashicorp/nomad/acl" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/acl" + "github.com/hashicorp/nomad/v2/nomad/structs" ) // Periodic endpoint is used for periodic job interactions diff --git a/nomad/periodic_endpoint_test.go b/nomad/periodic_endpoint_test.go index ee14ad8bc24..053d9adc402 100644 --- a/nomad/periodic_endpoint_test.go +++ b/nomad/periodic_endpoint_test.go @@ -8,11 +8,11 @@ import ( memdb "github.com/hashicorp/go-memdb" msgpackrpc "github.com/hashicorp/net-rpc-msgpackrpc/v2" - "github.com/hashicorp/nomad/acl" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/testutil" + "github.com/hashicorp/nomad/v2/acl" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/testutil" "github.com/stretchr/testify/assert" ) diff --git a/nomad/periodic_test.go b/nomad/periodic_test.go index bb17bb5cc7a..b6be2ecc956 100644 --- a/nomad/periodic_test.go +++ b/nomad/periodic_test.go @@ -14,11 +14,11 @@ import ( "testing" "time" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/helper/testlog" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/testutil" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/helper/testlog" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/testutil" "github.com/shoenig/test/must" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/nomad/plan_apply.go b/nomad/plan_apply.go index 776fdb1cbe2..8a545581d46 100644 --- a/nomad/plan_apply.go +++ b/nomad/plan_apply.go @@ -13,9 +13,9 @@ import ( memdb "github.com/hashicorp/go-memdb" metrics "github.com/hashicorp/go-metrics/compat" multierror "github.com/hashicorp/go-multierror" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/nomad/state" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/nomad/state" + "github.com/hashicorp/nomad/v2/nomad/structs" "github.com/hashicorp/raft" ) diff --git a/nomad/plan_apply_ce.go b/nomad/plan_apply_ce.go index cb96e234941..3abce4b4498 100644 --- a/nomad/plan_apply_ce.go +++ b/nomad/plan_apply_ce.go @@ -7,8 +7,8 @@ package nomad import ( - "github.com/hashicorp/nomad/nomad/state" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/nomad/state" + "github.com/hashicorp/nomad/v2/nomad/structs" ) // refreshIndex returns the index the scheduler should refresh to as the maximum diff --git a/nomad/plan_apply_node_tracker.go b/nomad/plan_apply_node_tracker.go index 5b36d2f4999..14ac09dd1ab 100644 --- a/nomad/plan_apply_node_tracker.go +++ b/nomad/plan_apply_node_tracker.go @@ -10,7 +10,7 @@ import ( "github.com/hashicorp/go-hclog" metrics "github.com/hashicorp/go-metrics/compat" lru "github.com/hashicorp/golang-lru/v2" - "github.com/hashicorp/nomad/helper" + "github.com/hashicorp/nomad/v2/helper" "golang.org/x/time/rate" ) diff --git a/nomad/plan_apply_node_tracker_test.go b/nomad/plan_apply_node_tracker_test.go index 592fda96966..c4dd0aae85d 100644 --- a/nomad/plan_apply_node_tracker_test.go +++ b/nomad/plan_apply_node_tracker_test.go @@ -9,7 +9,7 @@ import ( "time" "github.com/hashicorp/go-hclog" - "github.com/hashicorp/nomad/ci" + "github.com/hashicorp/nomad/v2/ci" "github.com/stretchr/testify/require" ) diff --git a/nomad/plan_apply_pool.go b/nomad/plan_apply_pool.go index d493c7b46e0..b2e01bb7b18 100644 --- a/nomad/plan_apply_pool.go +++ b/nomad/plan_apply_pool.go @@ -4,8 +4,8 @@ package nomad import ( - "github.com/hashicorp/nomad/nomad/state" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/nomad/state" + "github.com/hashicorp/nomad/v2/nomad/structs" ) const ( diff --git a/nomad/plan_apply_pool_test.go b/nomad/plan_apply_pool_test.go index 1e8431d34a0..26466f21c6e 100644 --- a/nomad/plan_apply_pool_test.go +++ b/nomad/plan_apply_pool_test.go @@ -6,9 +6,9 @@ package nomad import ( "testing" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" ) func TestEvaluatePool(t *testing.T) { diff --git a/nomad/plan_apply_test.go b/nomad/plan_apply_test.go index a6e3f7810cf..095d538c31f 100644 --- a/nomad/plan_apply_test.go +++ b/nomad/plan_apply_test.go @@ -10,12 +10,12 @@ import ( "time" memdb "github.com/hashicorp/go-memdb" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/helper/testlog" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/testutil" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/helper/testlog" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/testutil" "github.com/hashicorp/raft" "github.com/shoenig/test/must" "github.com/stretchr/testify/require" diff --git a/nomad/plan_endpoint.go b/nomad/plan_endpoint.go index 20de70d59e4..4f32c337853 100644 --- a/nomad/plan_endpoint.go +++ b/nomad/plan_endpoint.go @@ -10,7 +10,7 @@ import ( "github.com/hashicorp/go-hclog" metrics "github.com/hashicorp/go-metrics/compat" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/nomad/structs" ) // Plan endpoint is used for plan interactions diff --git a/nomad/plan_endpoint_test.go b/nomad/plan_endpoint_test.go index 30e03e46295..bf9be6dd949 100644 --- a/nomad/plan_endpoint_test.go +++ b/nomad/plan_endpoint_test.go @@ -9,10 +9,10 @@ import ( "time" msgpackrpc "github.com/hashicorp/net-rpc-msgpackrpc/v2" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/testutil" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/testutil" "github.com/shoenig/test/must" ) diff --git a/nomad/plan_queue.go b/nomad/plan_queue.go index ea65d727de2..2064dc8cfcd 100644 --- a/nomad/plan_queue.go +++ b/nomad/plan_queue.go @@ -10,8 +10,8 @@ import ( "time" metrics "github.com/hashicorp/go-metrics/compat" - "github.com/hashicorp/nomad/helper" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/helper" + "github.com/hashicorp/nomad/v2/nomad/structs" ) var ( diff --git a/nomad/plan_queue_test.go b/nomad/plan_queue_test.go index 8f9be515039..aace13e9bcd 100644 --- a/nomad/plan_queue_test.go +++ b/nomad/plan_queue_test.go @@ -7,9 +7,9 @@ import ( "testing" "time" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" ) func testPlanQueue(t *testing.T) *PlanQueue { diff --git a/nomad/raft_rpc.go b/nomad/raft_rpc.go index fb0fde0b8a9..d54f086d05b 100644 --- a/nomad/raft_rpc.go +++ b/nomad/raft_rpc.go @@ -10,8 +10,8 @@ import ( "sync" "time" - "github.com/hashicorp/nomad/helper/pool" - "github.com/hashicorp/nomad/helper/tlsutil" + "github.com/hashicorp/nomad/v2/helper/pool" + "github.com/hashicorp/nomad/v2/helper/tlsutil" "github.com/hashicorp/raft" ) diff --git a/nomad/regions_endpoint.go b/nomad/regions_endpoint.go index 8bae3204765..448bfdadc54 100644 --- a/nomad/regions_endpoint.go +++ b/nomad/regions_endpoint.go @@ -6,7 +6,7 @@ package nomad import ( "github.com/hashicorp/go-hclog" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/nomad/structs" ) // Region is used to query and list the known regions diff --git a/nomad/regions_endpoint_test.go b/nomad/regions_endpoint_test.go index 52e1ad1c038..a9c499df5b4 100644 --- a/nomad/regions_endpoint_test.go +++ b/nomad/regions_endpoint_test.go @@ -8,9 +8,9 @@ import ( "testing" msgpackrpc "github.com/hashicorp/net-rpc-msgpackrpc/v2" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/testutil" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/testutil" ) func TestRegionList(t *testing.T) { diff --git a/nomad/rpc.go b/nomad/rpc.go index 854f84f57e6..246938c9090 100644 --- a/nomad/rpc.go +++ b/nomad/rpc.go @@ -22,12 +22,12 @@ import ( memdb "github.com/hashicorp/go-memdb" metrics "github.com/hashicorp/go-metrics/compat" "github.com/hashicorp/go-msgpack/v2/codec" - "github.com/hashicorp/nomad/helper" - "github.com/hashicorp/nomad/helper/pool" - "github.com/hashicorp/nomad/nomad/peers" - "github.com/hashicorp/nomad/nomad/state" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/nomad/structs/config" + "github.com/hashicorp/nomad/v2/helper" + "github.com/hashicorp/nomad/v2/helper/pool" + "github.com/hashicorp/nomad/v2/nomad/peers" + "github.com/hashicorp/nomad/v2/nomad/state" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/nomad/structs/config" "github.com/hashicorp/raft" "github.com/hashicorp/yamux" ) diff --git a/nomad/rpc_rate_metrics.go b/nomad/rpc_rate_metrics.go index 14c4f0b052c..ae897c0a353 100644 --- a/nomad/rpc_rate_metrics.go +++ b/nomad/rpc_rate_metrics.go @@ -6,7 +6,7 @@ package nomad import ( metrics "github.com/hashicorp/go-metrics/compat" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/nomad/structs" ) // MeasureRPCRate increments the appropriate rate metric for this endpoint, diff --git a/nomad/rpc_test.go b/nomad/rpc_test.go index 74a096a8b83..af60f4e1068 100644 --- a/nomad/rpc_test.go +++ b/nomad/rpc_test.go @@ -24,17 +24,17 @@ import ( "github.com/hashicorp/go-msgpack/v2/codec" "github.com/hashicorp/go-sockaddr" msgpackrpc "github.com/hashicorp/net-rpc-msgpackrpc/v2" - "github.com/hashicorp/nomad/ci" - cstructs "github.com/hashicorp/nomad/client/structs" - "github.com/hashicorp/nomad/helper/pool" - "github.com/hashicorp/nomad/helper/testlog" - "github.com/hashicorp/nomad/helper/tlsutil" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/peers" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/nomad/structs/config" - "github.com/hashicorp/nomad/testutil" + "github.com/hashicorp/nomad/v2/ci" + cstructs "github.com/hashicorp/nomad/v2/client/structs" + "github.com/hashicorp/nomad/v2/helper/pool" + "github.com/hashicorp/nomad/v2/helper/testlog" + "github.com/hashicorp/nomad/v2/helper/tlsutil" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/peers" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/nomad/structs/config" + "github.com/hashicorp/nomad/v2/testutil" "github.com/hashicorp/raft" "github.com/hashicorp/yamux" "github.com/shoenig/test/must" diff --git a/nomad/scaling_endpoint.go b/nomad/scaling_endpoint.go index ab70254d4e9..35687f21fe0 100644 --- a/nomad/scaling_endpoint.go +++ b/nomad/scaling_endpoint.go @@ -10,9 +10,9 @@ import ( "github.com/hashicorp/go-hclog" "github.com/hashicorp/go-memdb" metrics "github.com/hashicorp/go-metrics/compat" - "github.com/hashicorp/nomad/acl" - "github.com/hashicorp/nomad/nomad/state" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/acl" + "github.com/hashicorp/nomad/v2/nomad/state" + "github.com/hashicorp/nomad/v2/nomad/structs" ) // Scaling endpoint is used for listing and retrieving scaling policies diff --git a/nomad/scaling_endpoint_test.go b/nomad/scaling_endpoint_test.go index 21f521c96f4..0f704de3615 100644 --- a/nomad/scaling_endpoint_test.go +++ b/nomad/scaling_endpoint_test.go @@ -8,12 +8,12 @@ import ( "time" msgpackrpc "github.com/hashicorp/net-rpc-msgpackrpc/v2" - "github.com/hashicorp/nomad/acl" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/testutil" + "github.com/hashicorp/nomad/v2/acl" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/testutil" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/nomad/search_endpoint.go b/nomad/search_endpoint.go index 438398e3ec6..f964f4d22be 100644 --- a/nomad/search_endpoint.go +++ b/nomad/search_endpoint.go @@ -13,9 +13,9 @@ import ( "github.com/hashicorp/go-memdb" metrics "github.com/hashicorp/go-metrics/compat" - "github.com/hashicorp/nomad/acl" - "github.com/hashicorp/nomad/nomad/state" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/acl" + "github.com/hashicorp/nomad/v2/nomad/state" + "github.com/hashicorp/nomad/v2/nomad/structs" ) const ( diff --git a/nomad/search_endpoint_ce.go b/nomad/search_endpoint_ce.go index 9104fa32104..ffd631774e2 100644 --- a/nomad/search_endpoint_ce.go +++ b/nomad/search_endpoint_ce.go @@ -10,9 +10,9 @@ import ( "fmt" memdb "github.com/hashicorp/go-memdb" - "github.com/hashicorp/nomad/acl" - "github.com/hashicorp/nomad/nomad/state" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/acl" + "github.com/hashicorp/nomad/v2/nomad/state" + "github.com/hashicorp/nomad/v2/nomad/structs" ) var ( diff --git a/nomad/search_endpoint_test.go b/nomad/search_endpoint_test.go index a4a2d688fca..2c6376594e5 100644 --- a/nomad/search_endpoint_test.go +++ b/nomad/search_endpoint_test.go @@ -11,13 +11,13 @@ import ( "testing" msgpackrpc "github.com/hashicorp/net-rpc-msgpackrpc/v2" - "github.com/hashicorp/nomad/acl" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/state" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/testutil" + "github.com/hashicorp/nomad/v2/acl" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/state" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/testutil" "github.com/shoenig/test/must" "github.com/stretchr/testify/require" ) diff --git a/nomad/serf.go b/nomad/serf.go index 6b4432f31fe..215af16b7a6 100644 --- a/nomad/serf.go +++ b/nomad/serf.go @@ -9,8 +9,8 @@ import ( log "github.com/hashicorp/go-hclog" - "github.com/hashicorp/nomad/nomad/peers" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/nomad/peers" + "github.com/hashicorp/nomad/v2/nomad/structs" "github.com/hashicorp/raft" "github.com/hashicorp/serf/serf" ) diff --git a/nomad/serf_test.go b/nomad/serf_test.go index 04f4995b9e5..a9ab002c412 100644 --- a/nomad/serf_test.go +++ b/nomad/serf_test.go @@ -11,8 +11,8 @@ import ( "testing" "time" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/testutil" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/testutil" "github.com/hashicorp/raft" "github.com/hashicorp/serf/serf" "github.com/shoenig/test/must" diff --git a/nomad/server.go b/nomad/server.go index 04e833bf801..b3238a9fed4 100644 --- a/nomad/server.go +++ b/nomad/server.go @@ -34,26 +34,26 @@ import ( "github.com/hashicorp/serf/serf" "go.etcd.io/bbolt" - "github.com/hashicorp/nomad/command/agent/consul" - "github.com/hashicorp/nomad/helper" - "github.com/hashicorp/nomad/helper/codec" - "github.com/hashicorp/nomad/helper/goruntime" - "github.com/hashicorp/nomad/helper/group" - "github.com/hashicorp/nomad/helper/pool" - "github.com/hashicorp/nomad/helper/tlsutil" - "github.com/hashicorp/nomad/lib/auth/oidc" - "github.com/hashicorp/nomad/nomad/auth" - "github.com/hashicorp/nomad/nomad/deploymentwatcher" - "github.com/hashicorp/nomad/nomad/drainer" - "github.com/hashicorp/nomad/nomad/lock" - "github.com/hashicorp/nomad/nomad/peers" - "github.com/hashicorp/nomad/nomad/reporting" - "github.com/hashicorp/nomad/nomad/state" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/nomad/structs/config" - "github.com/hashicorp/nomad/nomad/volumewatcher" - "github.com/hashicorp/nomad/scheduler" - sstructs "github.com/hashicorp/nomad/scheduler/structs" + "github.com/hashicorp/nomad/v2/command/agent/consul" + "github.com/hashicorp/nomad/v2/helper" + "github.com/hashicorp/nomad/v2/helper/codec" + "github.com/hashicorp/nomad/v2/helper/goruntime" + "github.com/hashicorp/nomad/v2/helper/group" + "github.com/hashicorp/nomad/v2/helper/pool" + "github.com/hashicorp/nomad/v2/helper/tlsutil" + "github.com/hashicorp/nomad/v2/lib/auth/oidc" + "github.com/hashicorp/nomad/v2/nomad/auth" + "github.com/hashicorp/nomad/v2/nomad/deploymentwatcher" + "github.com/hashicorp/nomad/v2/nomad/drainer" + "github.com/hashicorp/nomad/v2/nomad/lock" + "github.com/hashicorp/nomad/v2/nomad/peers" + "github.com/hashicorp/nomad/v2/nomad/reporting" + "github.com/hashicorp/nomad/v2/nomad/state" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/nomad/structs/config" + "github.com/hashicorp/nomad/v2/nomad/volumewatcher" + "github.com/hashicorp/nomad/v2/scheduler" + sstructs "github.com/hashicorp/nomad/v2/scheduler/structs" ) const ( diff --git a/nomad/server_test.go b/nomad/server_test.go index a9cf13c1d5f..e0f1755be7c 100644 --- a/nomad/server_test.go +++ b/nomad/server_test.go @@ -13,12 +13,12 @@ import ( "time" msgpackrpc "github.com/hashicorp/net-rpc-msgpackrpc/v2" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/helper/testlog" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/nomad/structs/config" - "github.com/hashicorp/nomad/testutil" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/helper/testlog" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/nomad/structs/config" + "github.com/hashicorp/nomad/v2/testutil" "github.com/shoenig/test/must" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/nomad/service_registration_endpoint.go b/nomad/service_registration_endpoint.go index f12c624c424..bc796024aa7 100644 --- a/nomad/service_registration_endpoint.go +++ b/nomad/service_registration_endpoint.go @@ -16,11 +16,11 @@ import ( "github.com/hashicorp/go-multierror" "github.com/hashicorp/go-set/v3" - "github.com/hashicorp/nomad/acl" - "github.com/hashicorp/nomad/nomad/auth" - "github.com/hashicorp/nomad/nomad/state" - "github.com/hashicorp/nomad/nomad/state/paginator" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/acl" + "github.com/hashicorp/nomad/v2/nomad/auth" + "github.com/hashicorp/nomad/v2/nomad/state" + "github.com/hashicorp/nomad/v2/nomad/state/paginator" + "github.com/hashicorp/nomad/v2/nomad/structs" ) // ServiceRegistration encapsulates the service registrations RPC endpoint diff --git a/nomad/service_registration_endpoint_test.go b/nomad/service_registration_endpoint_test.go index 370ba1983e4..48d6f9e733b 100644 --- a/nomad/service_registration_endpoint_test.go +++ b/nomad/service_registration_endpoint_test.go @@ -10,12 +10,12 @@ import ( "github.com/hashicorp/go-memdb" msgpackrpc "github.com/hashicorp/net-rpc-msgpackrpc/v2" - "github.com/hashicorp/nomad/acl" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/testutil" + "github.com/hashicorp/nomad/v2/acl" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/testutil" "github.com/shoenig/test/must" "github.com/stretchr/testify/require" ) diff --git a/nomad/state/autopilot.go b/nomad/state/autopilot.go index 517ea8dbee4..2eb92519a3f 100644 --- a/nomad/state/autopilot.go +++ b/nomad/state/autopilot.go @@ -7,7 +7,7 @@ import ( "fmt" memdb "github.com/hashicorp/go-memdb" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/nomad/structs" ) // autopilotConfigTableSchema returns a new table schema used for storing diff --git a/nomad/state/autopilot_test.go b/nomad/state/autopilot_test.go index fc13db6aba6..31ebebd7e62 100644 --- a/nomad/state/autopilot_test.go +++ b/nomad/state/autopilot_test.go @@ -8,8 +8,8 @@ import ( "testing" "time" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/nomad/structs" ) func TestStateStore_Autopilot(t *testing.T) { diff --git a/nomad/state/deployment_events_test.go b/nomad/state/deployment_events_test.go index 090b9bd1835..2f1bc2533db 100644 --- a/nomad/state/deployment_events_test.go +++ b/nomad/state/deployment_events_test.go @@ -8,10 +8,10 @@ import ( "testing" "time" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/stream" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/stream" + "github.com/hashicorp/nomad/v2/nomad/structs" "github.com/shoenig/test/must" ) diff --git a/nomad/state/events.go b/nomad/state/events.go index 2aaa7e158ac..d3134cacb33 100644 --- a/nomad/state/events.go +++ b/nomad/state/events.go @@ -5,7 +5,7 @@ package state import ( memdb "github.com/hashicorp/go-memdb" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/nomad/structs" ) var MsgTypeEvents = map[structs.MessageType]string{ diff --git a/nomad/state/events_ce.go b/nomad/state/events_ce.go index ae982dd4acb..2c31ffd050f 100644 --- a/nomad/state/events_ce.go +++ b/nomad/state/events_ce.go @@ -8,7 +8,7 @@ package state import ( memdb "github.com/hashicorp/go-memdb" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/nomad/structs" ) var EnterpriseMsgTypeEvents = map[structs.MessageType]string{} diff --git a/nomad/state/events_test.go b/nomad/state/events_test.go index 5ec8df78e4f..fd6e6527175 100644 --- a/nomad/state/events_test.go +++ b/nomad/state/events_test.go @@ -8,10 +8,10 @@ import ( "time" memdb "github.com/hashicorp/go-memdb" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" "github.com/shoenig/test/must" ) diff --git a/nomad/state/indexer/time_test.go b/nomad/state/indexer/time_test.go index 269f6685d65..c455b8a7d31 100644 --- a/nomad/state/indexer/time_test.go +++ b/nomad/state/indexer/time_test.go @@ -7,7 +7,7 @@ import ( "testing" "time" - "github.com/hashicorp/nomad/ci" + "github.com/hashicorp/nomad/v2/ci" "github.com/shoenig/test/must" ) diff --git a/nomad/state/iterator_test.go b/nomad/state/iterator_test.go index ce94f8e82d4..834e9264434 100644 --- a/nomad/state/iterator_test.go +++ b/nomad/state/iterator_test.go @@ -6,7 +6,7 @@ package state import ( "testing" - "github.com/hashicorp/nomad/ci" + "github.com/hashicorp/nomad/v2/ci" "github.com/shoenig/test/must" ) diff --git a/nomad/state/paginator/filter_test.go b/nomad/state/paginator/filter_test.go index 806d8557a7b..0e88a5ae69a 100644 --- a/nomad/state/paginator/filter_test.go +++ b/nomad/state/paginator/filter_test.go @@ -8,10 +8,10 @@ import ( "time" "github.com/hashicorp/go-bexpr" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/nomad/state" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/nomad/state" + "github.com/hashicorp/nomad/v2/nomad/structs" "github.com/shoenig/test/must" ) diff --git a/nomad/state/paginator/paginator.go b/nomad/state/paginator/paginator.go index 4c10e79a2c1..ff1e8f16452 100644 --- a/nomad/state/paginator/paginator.go +++ b/nomad/state/paginator/paginator.go @@ -8,7 +8,7 @@ import ( "fmt" "github.com/hashicorp/go-bexpr" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/nomad/structs" ) // Iterator is the interface that must be implemented to supply data to the diff --git a/nomad/state/paginator/paginator_test.go b/nomad/state/paginator/paginator_test.go index d3fd163ff1b..9e9a6217f74 100644 --- a/nomad/state/paginator/paginator_test.go +++ b/nomad/state/paginator/paginator_test.go @@ -7,8 +7,8 @@ import ( "errors" "testing" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/nomad/structs" "github.com/shoenig/test/must" ) diff --git a/nomad/state/paginator/tokenizer_test.go b/nomad/state/paginator/tokenizer_test.go index 244ee5ce009..4c6717cf383 100644 --- a/nomad/state/paginator/tokenizer_test.go +++ b/nomad/state/paginator/tokenizer_test.go @@ -7,9 +7,9 @@ import ( "fmt" "testing" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" "github.com/shoenig/test/must" ) diff --git a/nomad/state/schema.go b/nomad/state/schema.go index da8e580e807..15d232c863a 100644 --- a/nomad/state/schema.go +++ b/nomad/state/schema.go @@ -8,8 +8,8 @@ import ( "sync" "github.com/hashicorp/go-memdb" - "github.com/hashicorp/nomad/nomad/state/indexer" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/nomad/state/indexer" + "github.com/hashicorp/nomad/v2/nomad/structs" ) const ( diff --git a/nomad/state/schema_test.go b/nomad/state/schema_test.go index 052e95afe20..13fbde41278 100644 --- a/nomad/state/schema_test.go +++ b/nomad/state/schema_test.go @@ -8,9 +8,9 @@ import ( "testing" "github.com/hashicorp/go-memdb" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" "github.com/shoenig/test/must" ) diff --git a/nomad/state/sorting.go b/nomad/state/sorting.go index 460ac382a0e..e3f0d1316e9 100644 --- a/nomad/state/sorting.go +++ b/nomad/state/sorting.go @@ -7,7 +7,7 @@ import ( "fmt" "github.com/hashicorp/go-memdb" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/nomad/structs" ) // SortOption represents how results can be sorted. diff --git a/nomad/state/sorting_test.go b/nomad/state/sorting_test.go index b140706a96b..e37e63f3c70 100644 --- a/nomad/state/sorting_test.go +++ b/nomad/state/sorting_test.go @@ -7,8 +7,8 @@ import ( "testing" "github.com/hashicorp/go-hclog" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" "github.com/shoenig/test/must" ) diff --git a/nomad/state/state_changes.go b/nomad/state/state_changes.go index cbe18404a9f..de9b87fb43c 100644 --- a/nomad/state/state_changes.go +++ b/nomad/state/state_changes.go @@ -5,8 +5,8 @@ package state import ( "github.com/hashicorp/go-memdb" - "github.com/hashicorp/nomad/nomad/stream" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/nomad/stream" + "github.com/hashicorp/nomad/v2/nomad/structs" ) // ReadTxn is implemented by memdb.Txn to perform read operations. diff --git a/nomad/state/state_store.go b/nomad/state/state_store.go index 6c5cb67d8c2..d15924cb131 100644 --- a/nomad/state/state_store.go +++ b/nomad/state/state_store.go @@ -18,10 +18,10 @@ import ( "github.com/hashicorp/go-memdb" "github.com/hashicorp/go-multierror" "github.com/hashicorp/go-set/v3" - "github.com/hashicorp/nomad/helper" - "github.com/hashicorp/nomad/lib/lang" - "github.com/hashicorp/nomad/nomad/stream" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/helper" + "github.com/hashicorp/nomad/v2/lib/lang" + "github.com/hashicorp/nomad/v2/nomad/stream" + "github.com/hashicorp/nomad/v2/nomad/structs" ) // Txn is a transaction against a state store. diff --git a/nomad/state/state_store_acl.go b/nomad/state/state_store_acl.go index e34c0b57c88..e87c2ed452d 100644 --- a/nomad/state/state_store_acl.go +++ b/nomad/state/state_store_acl.go @@ -9,7 +9,7 @@ import ( "slices" "github.com/hashicorp/go-memdb" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/nomad/structs" ) // ACLTokensByExpired returns an array accessor IDs of expired ACL tokens. diff --git a/nomad/state/state_store_acl_binding_rule.go b/nomad/state/state_store_acl_binding_rule.go index 68db34239b2..beac22c9af5 100644 --- a/nomad/state/state_store_acl_binding_rule.go +++ b/nomad/state/state_store_acl_binding_rule.go @@ -8,7 +8,7 @@ import ( "fmt" "github.com/hashicorp/go-memdb" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/nomad/structs" ) // UpsertACLBindingRules is used to insert a number of ACL binding rules into diff --git a/nomad/state/state_store_acl_binding_rule_test.go b/nomad/state/state_store_acl_binding_rule_test.go index 94e7ae70b47..28eea3184bd 100644 --- a/nomad/state/state_store_acl_binding_rule_test.go +++ b/nomad/state/state_store_acl_binding_rule_test.go @@ -7,10 +7,10 @@ import ( "testing" "github.com/hashicorp/go-memdb" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" "github.com/shoenig/test/must" ) diff --git a/nomad/state/state_store_acl_sso.go b/nomad/state/state_store_acl_sso.go index 78337b6a6b9..4ae7bd25fab 100644 --- a/nomad/state/state_store_acl_sso.go +++ b/nomad/state/state_store_acl_sso.go @@ -8,7 +8,7 @@ import ( "fmt" "github.com/hashicorp/go-memdb" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/nomad/structs" ) // UpsertACLAuthMethods is used to insert a number of ACL auth methods into the diff --git a/nomad/state/state_store_acl_sso_test.go b/nomad/state/state_store_acl_sso_test.go index 79a3f827b4e..61c4433335b 100644 --- a/nomad/state/state_store_acl_sso_test.go +++ b/nomad/state/state_store_acl_sso_test.go @@ -7,9 +7,9 @@ import ( "testing" "github.com/hashicorp/go-memdb" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" "github.com/shoenig/test/must" ) diff --git a/nomad/state/state_store_acl_test.go b/nomad/state/state_store_acl_test.go index dbf2c1555d3..7deb68ce677 100644 --- a/nomad/state/state_store_acl_test.go +++ b/nomad/state/state_store_acl_test.go @@ -9,10 +9,10 @@ import ( "time" "github.com/hashicorp/go-memdb" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" "github.com/shoenig/test/must" ) diff --git a/nomad/state/state_store_ce.go b/nomad/state/state_store_ce.go index b7fdaa8867b..3614167a5cb 100644 --- a/nomad/state/state_store_ce.go +++ b/nomad/state/state_store_ce.go @@ -7,7 +7,7 @@ package state import ( - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/nomad/structs" ) // quotaSpecExists on returns whether the quota exists diff --git a/nomad/state/state_store_host_volumes.go b/nomad/state/state_store_host_volumes.go index 8b920a3a4f0..62c3f42dfd7 100644 --- a/nomad/state/state_store_host_volumes.go +++ b/nomad/state/state_store_host_volumes.go @@ -8,7 +8,7 @@ import ( "strings" memdb "github.com/hashicorp/go-memdb" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/nomad/structs" ) // HostVolumeByID retrieve a specific host volume diff --git a/nomad/state/state_store_host_volumes_ce.go b/nomad/state/state_store_host_volumes_ce.go index e66a27e4a6e..0399b5c2be7 100644 --- a/nomad/state/state_store_host_volumes_ce.go +++ b/nomad/state/state_store_host_volumes_ce.go @@ -5,7 +5,7 @@ package state -import "github.com/hashicorp/nomad/nomad/structs" +import "github.com/hashicorp/nomad/v2/nomad/structs" func (s *StateStore) EnforceHostVolumeQuota(_ *structs.HostVolume, _ *structs.HostVolume) error { return nil diff --git a/nomad/state/state_store_host_volumes_test.go b/nomad/state/state_store_host_volumes_test.go index 3b172f949f9..eea349a3e47 100644 --- a/nomad/state/state_store_host_volumes_test.go +++ b/nomad/state/state_store_host_volumes_test.go @@ -8,10 +8,10 @@ import ( "testing" memdb "github.com/hashicorp/go-memdb" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" "github.com/shoenig/test/must" ) diff --git a/nomad/state/state_store_keyring.go b/nomad/state/state_store_keyring.go index 294883e194e..46303132efd 100644 --- a/nomad/state/state_store_keyring.go +++ b/nomad/state/state_store_keyring.go @@ -7,7 +7,7 @@ import ( "fmt" memdb "github.com/hashicorp/go-memdb" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/nomad/structs" ) // UpsertRootKey saves a root key or updates it in place. diff --git a/nomad/state/state_store_keyring_test.go b/nomad/state/state_store_keyring_test.go index baeb253974a..a3f76d42b51 100644 --- a/nomad/state/state_store_keyring_test.go +++ b/nomad/state/state_store_keyring_test.go @@ -6,10 +6,10 @@ package state import ( "testing" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" "github.com/shoenig/test/must" ) diff --git a/nomad/state/state_store_node_pools.go b/nomad/state/state_store_node_pools.go index c2fa32c7653..fa77bd657d0 100644 --- a/nomad/state/state_store_node_pools.go +++ b/nomad/state/state_store_node_pools.go @@ -7,7 +7,7 @@ import ( "fmt" memdb "github.com/hashicorp/go-memdb" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/nomad/structs" ) // nodePoolInit creates the built-in node pools that should always be present diff --git a/nomad/state/state_store_node_pools_test.go b/nomad/state/state_store_node_pools_test.go index 49786e35233..bd428278c61 100644 --- a/nomad/state/state_store_node_pools_test.go +++ b/nomad/state/state_store_node_pools_test.go @@ -8,9 +8,9 @@ import ( "testing" memdb "github.com/hashicorp/go-memdb" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" "github.com/shoenig/test/must" ) diff --git a/nomad/state/state_store_restore.go b/nomad/state/state_store_restore.go index fb7e8d16aaa..5a0a30bff2c 100644 --- a/nomad/state/state_store_restore.go +++ b/nomad/state/state_store_restore.go @@ -6,7 +6,7 @@ package state import ( "fmt" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/nomad/structs" ) // StateRestore is used to optimize the performance when restoring state by diff --git a/nomad/state/state_store_restore_test.go b/nomad/state/state_store_restore_test.go index 774d2d2f382..257a6ba5f87 100644 --- a/nomad/state/state_store_restore_test.go +++ b/nomad/state/state_store_restore_test.go @@ -8,10 +8,10 @@ import ( "time" "github.com/hashicorp/go-memdb" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" "github.com/shoenig/test/must" ) diff --git a/nomad/state/state_store_service_registration.go b/nomad/state/state_store_service_registration.go index 1f495ce2e4a..76f11df31ac 100644 --- a/nomad/state/state_store_service_registration.go +++ b/nomad/state/state_store_service_registration.go @@ -8,7 +8,7 @@ import ( "fmt" "github.com/hashicorp/go-memdb" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/nomad/structs" ) // UpsertServiceRegistrations is used to insert a number of service diff --git a/nomad/state/state_store_service_registration_test.go b/nomad/state/state_store_service_registration_test.go index 18a0479b1db..1c435b09cb4 100644 --- a/nomad/state/state_store_service_registration_test.go +++ b/nomad/state/state_store_service_registration_test.go @@ -8,9 +8,9 @@ import ( "testing" "github.com/hashicorp/go-memdb" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" "github.com/shoenig/test/must" ) diff --git a/nomad/state/state_store_task_group_volume_claims.go b/nomad/state/state_store_task_group_volume_claims.go index 55e3ee80235..2b5ef311fa9 100644 --- a/nomad/state/state_store_task_group_volume_claims.go +++ b/nomad/state/state_store_task_group_volume_claims.go @@ -8,8 +8,8 @@ import ( "fmt" "github.com/hashicorp/go-memdb" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/nomad/structs" ) // UpsertTaskGroupHostVolumeClaim is used to upsert claims into the state store. diff --git a/nomad/state/state_store_task_group_volume_claims_test.go b/nomad/state/state_store_task_group_volume_claims_test.go index cacd7188f81..b26e573a7ac 100644 --- a/nomad/state/state_store_task_group_volume_claims_test.go +++ b/nomad/state/state_store_task_group_volume_claims_test.go @@ -7,10 +7,10 @@ import ( "testing" "github.com/hashicorp/go-memdb" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" "github.com/shoenig/test/must" ) diff --git a/nomad/state/state_store_test.go b/nomad/state/state_store_test.go index 11b87db2ee9..576fbf9abdf 100644 --- a/nomad/state/state_store_test.go +++ b/nomad/state/state_store_test.go @@ -13,10 +13,10 @@ import ( "time" "github.com/hashicorp/go-memdb" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" "github.com/kr/pretty" "github.com/shoenig/test" "github.com/shoenig/test/must" diff --git a/nomad/state/state_store_variables.go b/nomad/state/state_store_variables.go index 0424b1c9569..fdce86bcb63 100644 --- a/nomad/state/state_store_variables.go +++ b/nomad/state/state_store_variables.go @@ -9,7 +9,7 @@ import ( "math" "github.com/hashicorp/go-memdb" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/nomad/structs" ) var ( diff --git a/nomad/state/state_store_variables_test.go b/nomad/state/state_store_variables_test.go index d2be3d6b083..4286a35773e 100644 --- a/nomad/state/state_store_variables_test.go +++ b/nomad/state/state_store_variables_test.go @@ -12,10 +12,10 @@ import ( memdb "github.com/hashicorp/go-memdb" "github.com/shoenig/test/must" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" ) func TestStateStore_GetVariable(t *testing.T) { diff --git a/nomad/state/testing.go b/nomad/state/testing.go index efbd5fcaa01..d3dd5cc9f85 100644 --- a/nomad/state/testing.go +++ b/nomad/state/testing.go @@ -8,10 +8,10 @@ import ( "testing" "time" - "github.com/hashicorp/nomad/helper/testlog" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/helper/testlog" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" ) func TestStateStore(t testing.TB) *StateStore { diff --git a/nomad/stats_fetcher.go b/nomad/stats_fetcher.go index e714727d7b1..f2ac783b268 100644 --- a/nomad/stats_fetcher.go +++ b/nomad/stats_fetcher.go @@ -12,8 +12,8 @@ import ( "github.com/hashicorp/raft" autopilot "github.com/hashicorp/raft-autopilot" - "github.com/hashicorp/nomad/helper/pool" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/helper/pool" + "github.com/hashicorp/nomad/v2/nomad/structs" ) // StatsFetcher has two functions for autopilot. First, lets us fetch all the diff --git a/nomad/stats_fetcher_test.go b/nomad/stats_fetcher_test.go index 09bc473268b..c39e854df1a 100644 --- a/nomad/stats_fetcher_test.go +++ b/nomad/stats_fetcher_test.go @@ -8,9 +8,9 @@ import ( "testing" "time" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/nomad/peers" - "github.com/hashicorp/nomad/testutil" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/nomad/peers" + "github.com/hashicorp/nomad/v2/testutil" "github.com/hashicorp/raft" "github.com/shoenig/test/must" ) diff --git a/nomad/status_endpoint.go b/nomad/status_endpoint.go index 1873796567d..7bb3a81873e 100644 --- a/nomad/status_endpoint.go +++ b/nomad/status_endpoint.go @@ -10,7 +10,7 @@ import ( "github.com/hashicorp/go-hclog" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/nomad/structs" ) // Status endpoint is used to check on server status diff --git a/nomad/status_endpoint_test.go b/nomad/status_endpoint_test.go index 9ce86be9437..4604337c724 100644 --- a/nomad/status_endpoint_test.go +++ b/nomad/status_endpoint_test.go @@ -7,12 +7,12 @@ import ( "testing" msgpackrpc "github.com/hashicorp/net-rpc-msgpackrpc/v2" - "github.com/hashicorp/nomad/acl" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/testutil" + "github.com/hashicorp/nomad/v2/acl" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/testutil" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/nomad/stream/event_broker.go b/nomad/stream/event_broker.go index 6fc2325e458..fa564ff3481 100644 --- a/nomad/stream/event_broker.go +++ b/nomad/stream/event_broker.go @@ -9,7 +9,7 @@ import ( "sync" "sync/atomic" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/nomad/structs" "github.com/hashicorp/go-hclog" metrics "github.com/hashicorp/go-metrics/compat" diff --git a/nomad/stream/event_broker_test.go b/nomad/stream/event_broker_test.go index 8d99e600abd..e771ae10486 100644 --- a/nomad/stream/event_broker_test.go +++ b/nomad/stream/event_broker_test.go @@ -9,8 +9,8 @@ import ( "testing" "time" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/nomad/structs" "github.com/shoenig/test/must" ) diff --git a/nomad/stream/event_buffer.go b/nomad/stream/event_buffer.go index babb26870b9..8409240975c 100644 --- a/nomad/stream/event_buffer.go +++ b/nomad/stream/event_buffer.go @@ -10,7 +10,7 @@ import ( "sync/atomic" "time" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/nomad/structs" ) // eventBuffer is a single-writer, multiple-reader, fixed length concurrent diff --git a/nomad/stream/event_buffer_test.go b/nomad/stream/event_buffer_test.go index dcc3f9f2a28..77580d76194 100644 --- a/nomad/stream/event_buffer_test.go +++ b/nomad/stream/event_buffer_test.go @@ -10,8 +10,8 @@ import ( "testing" "time" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/nomad/structs" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/nomad/stream/ndjson.go b/nomad/stream/ndjson.go index 8ec515dc23a..c1b5299d6bf 100644 --- a/nomad/stream/ndjson.go +++ b/nomad/stream/ndjson.go @@ -11,7 +11,7 @@ import ( "github.com/hashicorp/go-msgpack/v2/codec" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/nomad/structs" ) var ( diff --git a/nomad/stream/ndjson_test.go b/nomad/stream/ndjson_test.go index c97e0f7399a..53b5f671d02 100644 --- a/nomad/stream/ndjson_test.go +++ b/nomad/stream/ndjson_test.go @@ -8,7 +8,7 @@ import ( "testing" "time" - "github.com/hashicorp/nomad/ci" + "github.com/hashicorp/nomad/v2/ci" "github.com/stretchr/testify/require" ) diff --git a/nomad/stream/subscription.go b/nomad/stream/subscription.go index ee54ddff719..440f80a4a38 100644 --- a/nomad/stream/subscription.go +++ b/nomad/stream/subscription.go @@ -9,7 +9,7 @@ import ( "slices" "sync/atomic" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/nomad/structs" ) const ( diff --git a/nomad/stream/subscription_test.go b/nomad/stream/subscription_test.go index 70520b2b406..3ecd411304e 100644 --- a/nomad/stream/subscription_test.go +++ b/nomad/stream/subscription_test.go @@ -6,8 +6,8 @@ package stream import ( "testing" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/nomad/structs" "github.com/stretchr/testify/require" ) diff --git a/nomad/structs/acl.go b/nomad/structs/acl.go index 6e15945e92b..374f564cff3 100644 --- a/nomad/structs/acl.go +++ b/nomad/structs/acl.go @@ -20,10 +20,10 @@ import ( "github.com/hashicorp/go-multierror" "github.com/hashicorp/go-set/v3" lru "github.com/hashicorp/golang-lru/v2" - "github.com/hashicorp/nomad/acl" - "github.com/hashicorp/nomad/helper" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/lib/lang" + "github.com/hashicorp/nomad/v2/acl" + "github.com/hashicorp/nomad/v2/helper" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/lib/lang" "golang.org/x/crypto/blake2b" "oss.indeed.com/go/libtime" ) diff --git a/nomad/structs/acl_test.go b/nomad/structs/acl_test.go index b4a8e5a5242..708ff3f9c85 100644 --- a/nomad/structs/acl_test.go +++ b/nomad/structs/acl_test.go @@ -12,8 +12,8 @@ import ( "github.com/hashicorp/go-hclog" "github.com/hashicorp/go-multierror" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/helper/uuid" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/helper/uuid" "github.com/shoenig/test/must" "github.com/stretchr/testify/require" ) diff --git a/nomad/structs/actions_test.go b/nomad/structs/actions_test.go index 180c7f966ec..88221edab2c 100644 --- a/nomad/structs/actions_test.go +++ b/nomad/structs/actions_test.go @@ -8,7 +8,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/nomad/ci" + "github.com/hashicorp/nomad/v2/ci" "github.com/shoenig/test/must" ) diff --git a/nomad/structs/alloc.go b/nomad/structs/alloc.go index 0cac6d805ea..0788d1b1d9d 100644 --- a/nomad/structs/alloc.go +++ b/nomad/structs/alloc.go @@ -10,10 +10,10 @@ import ( "strconv" "time" - "github.com/hashicorp/nomad/client/lib/idset" - "github.com/hashicorp/nomad/client/lib/numalib/hw" - "github.com/hashicorp/nomad/helper/pointer" - "github.com/hashicorp/nomad/lib/kheap" + "github.com/hashicorp/nomad/v2/client/lib/idset" + "github.com/hashicorp/nomad/v2/client/lib/numalib/hw" + "github.com/hashicorp/nomad/v2/helper/pointer" + "github.com/hashicorp/nomad/v2/lib/kheap" ) const ( diff --git a/nomad/structs/alloc_test.go b/nomad/structs/alloc_test.go index e88db5dea4e..51d26ee5d6d 100644 --- a/nomad/structs/alloc_test.go +++ b/nomad/structs/alloc_test.go @@ -8,8 +8,8 @@ import ( "testing" "time" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/helper/uuid" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/helper/uuid" "github.com/shoenig/test/must" ) diff --git a/nomad/structs/batch_future_test.go b/nomad/structs/batch_future_test.go index f4f5c27a293..f61ca25638e 100644 --- a/nomad/structs/batch_future_test.go +++ b/nomad/structs/batch_future_test.go @@ -8,7 +8,7 @@ import ( "testing" "time" - "github.com/hashicorp/nomad/ci" + "github.com/hashicorp/nomad/v2/ci" ) func TestBatchFuture(t *testing.T) { diff --git a/nomad/structs/bitmap_test.go b/nomad/structs/bitmap_test.go index d5599645fde..6861200f561 100644 --- a/nomad/structs/bitmap_test.go +++ b/nomad/structs/bitmap_test.go @@ -6,7 +6,7 @@ package structs import ( "testing" - "github.com/hashicorp/nomad/ci" + "github.com/hashicorp/nomad/v2/ci" "github.com/shoenig/test/must" ) diff --git a/nomad/structs/check_test.go b/nomad/structs/check_test.go index 257a9710538..8495e9ce253 100644 --- a/nomad/structs/check_test.go +++ b/nomad/structs/check_test.go @@ -7,7 +7,7 @@ import ( "testing" "time" - "github.com/hashicorp/nomad/ci" + "github.com/hashicorp/nomad/v2/ci" "github.com/shoenig/test/must" ) diff --git a/nomad/structs/cni_config_test.go b/nomad/structs/cni_config_test.go index dbdc47216a3..9f2e1c56812 100644 --- a/nomad/structs/cni_config_test.go +++ b/nomad/structs/cni_config_test.go @@ -6,7 +6,7 @@ package structs import ( "testing" - "github.com/hashicorp/nomad/ci" + "github.com/hashicorp/nomad/v2/ci" "github.com/shoenig/test/must" ) diff --git a/nomad/structs/config/artifact.go b/nomad/structs/config/artifact.go index 00c63e67517..872a0aaae9a 100644 --- a/nomad/structs/config/artifact.go +++ b/nomad/structs/config/artifact.go @@ -10,8 +10,8 @@ import ( "time" "github.com/dustin/go-humanize" - "github.com/hashicorp/nomad/helper" - "github.com/hashicorp/nomad/helper/pointer" + "github.com/hashicorp/nomad/v2/helper" + "github.com/hashicorp/nomad/v2/helper/pointer" "github.com/shoenig/go-landlock" ) diff --git a/nomad/structs/config/artifact_test.go b/nomad/structs/config/artifact_test.go index f254d5794dd..a3294d34150 100644 --- a/nomad/structs/config/artifact_test.go +++ b/nomad/structs/config/artifact_test.go @@ -6,7 +6,7 @@ package config import ( "testing" - "github.com/hashicorp/nomad/ci" + "github.com/hashicorp/nomad/v2/ci" "github.com/shoenig/test/must" ) diff --git a/nomad/structs/config/audit_test.go b/nomad/structs/config/audit_test.go index ebbe49d7632..0d3c5eb88ed 100644 --- a/nomad/structs/config/audit_test.go +++ b/nomad/structs/config/audit_test.go @@ -7,7 +7,7 @@ import ( "testing" "time" - "github.com/hashicorp/nomad/ci" + "github.com/hashicorp/nomad/v2/ci" "github.com/stretchr/testify/require" ) diff --git a/nomad/structs/config/autopilot_test.go b/nomad/structs/config/autopilot_test.go index c9e9ed18303..856d36ab5bc 100644 --- a/nomad/structs/config/autopilot_test.go +++ b/nomad/structs/config/autopilot_test.go @@ -8,7 +8,7 @@ import ( "testing" "time" - "github.com/hashicorp/nomad/ci" + "github.com/hashicorp/nomad/v2/ci" ) func TestAutopilotConfig_Merge(t *testing.T) { diff --git a/nomad/structs/config/consul.go b/nomad/structs/config/consul.go index 4b230a9bff0..097bd096a05 100644 --- a/nomad/structs/config/consul.go +++ b/nomad/structs/config/consul.go @@ -13,7 +13,7 @@ import ( consul "github.com/hashicorp/consul/api" "github.com/hashicorp/go-secure-stdlib/listenerutil" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/nomad/structs" ) // ConsulConfig contains the configuration information necessary to diff --git a/nomad/structs/config/consul_test.go b/nomad/structs/config/consul_test.go index 8e50483d4cc..2672ff4e2e3 100644 --- a/nomad/structs/config/consul_test.go +++ b/nomad/structs/config/consul_test.go @@ -16,7 +16,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/hashicorp/nomad/ci" + "github.com/hashicorp/nomad/v2/ci" ) func TestMain(m *testing.M) { diff --git a/nomad/structs/config/drain.go b/nomad/structs/config/drain.go index 05176f82918..d8ff44ce09d 100644 --- a/nomad/structs/config/drain.go +++ b/nomad/structs/config/drain.go @@ -3,7 +3,7 @@ package config -import "github.com/hashicorp/nomad/helper/pointer" +import "github.com/hashicorp/nomad/v2/helper/pointer" // DrainConfig describes a Node's drain behavior on graceful shutdown. type DrainConfig struct { diff --git a/nomad/structs/config/drain_test.go b/nomad/structs/config/drain_test.go index 735abef19be..38b8181d92d 100644 --- a/nomad/structs/config/drain_test.go +++ b/nomad/structs/config/drain_test.go @@ -7,7 +7,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/nomad/ci" + "github.com/hashicorp/nomad/v2/ci" "github.com/shoenig/test/must" ) diff --git a/nomad/structs/config/limits_test.go b/nomad/structs/config/limits_test.go index 1210b000f14..f7d880bcdc5 100644 --- a/nomad/structs/config/limits_test.go +++ b/nomad/structs/config/limits_test.go @@ -7,7 +7,7 @@ import ( "testing" "time" - "github.com/hashicorp/nomad/ci" + "github.com/hashicorp/nomad/v2/ci" "github.com/stretchr/testify/require" ) diff --git a/nomad/structs/config/plugins_test.go b/nomad/structs/config/plugins_test.go index c9216fda0e2..a4935273637 100644 --- a/nomad/structs/config/plugins_test.go +++ b/nomad/structs/config/plugins_test.go @@ -7,7 +7,7 @@ import ( "sort" "testing" - "github.com/hashicorp/nomad/ci" + "github.com/hashicorp/nomad/v2/ci" "github.com/shoenig/test/must" "github.com/stretchr/testify/require" ) diff --git a/nomad/structs/config/reporting.go b/nomad/structs/config/reporting.go index 376d0f4def8..c9455ece7bb 100644 --- a/nomad/structs/config/reporting.go +++ b/nomad/structs/config/reporting.go @@ -6,7 +6,7 @@ package config import ( "time" - "github.com/hashicorp/nomad/helper/pointer" + "github.com/hashicorp/nomad/v2/helper/pointer" ) type LicenseReportingConfig struct { diff --git a/nomad/structs/config/reporting_test.go b/nomad/structs/config/reporting_test.go index 2be6b19ba40..3949a42d190 100644 --- a/nomad/structs/config/reporting_test.go +++ b/nomad/structs/config/reporting_test.go @@ -6,7 +6,7 @@ package config import ( "testing" - "github.com/hashicorp/nomad/ci" + "github.com/hashicorp/nomad/v2/ci" "github.com/shoenig/test/must" ) diff --git a/nomad/structs/config/sentinel.go b/nomad/structs/config/sentinel.go index d4486d8223c..130e469891d 100644 --- a/nomad/structs/config/sentinel.go +++ b/nomad/structs/config/sentinel.go @@ -6,7 +6,7 @@ package config import ( "slices" - "github.com/hashicorp/nomad/helper" + "github.com/hashicorp/nomad/v2/helper" ) // SentinelConfig is configuration specific to Sentinel diff --git a/nomad/structs/config/tls_test.go b/nomad/structs/config/tls_test.go index 7fff46e37fa..7e6e5be7bd0 100644 --- a/nomad/structs/config/tls_test.go +++ b/nomad/structs/config/tls_test.go @@ -6,7 +6,7 @@ package config import ( "testing" - "github.com/hashicorp/nomad/ci" + "github.com/hashicorp/nomad/v2/ci" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/nomad/structs/config/ui_test.go b/nomad/structs/config/ui_test.go index bacda9c5b75..56fdd6f860e 100644 --- a/nomad/structs/config/ui_test.go +++ b/nomad/structs/config/ui_test.go @@ -6,7 +6,7 @@ package config import ( "testing" - "github.com/hashicorp/nomad/ci" + "github.com/hashicorp/nomad/v2/ci" "github.com/stretchr/testify/require" ) diff --git a/nomad/structs/config/users.go b/nomad/structs/config/users.go index 3dbcf7bfb87..6e5d50d8e67 100644 --- a/nomad/structs/config/users.go +++ b/nomad/structs/config/users.go @@ -6,7 +6,7 @@ package config import ( "errors" - "github.com/hashicorp/nomad/helper/pointer" + "github.com/hashicorp/nomad/v2/helper/pointer" ) // UsersConfig configures things related to operating system users. diff --git a/nomad/structs/config/users_test.go b/nomad/structs/config/users_test.go index 1404ceb6a1f..d47bc880245 100644 --- a/nomad/structs/config/users_test.go +++ b/nomad/structs/config/users_test.go @@ -6,7 +6,7 @@ package config import ( "testing" - "github.com/hashicorp/nomad/ci" + "github.com/hashicorp/nomad/v2/ci" "github.com/shoenig/test/must" ) diff --git a/nomad/structs/config/vault.go b/nomad/structs/config/vault.go index bd3d4ca4b32..9a93aa78cd7 100644 --- a/nomad/structs/config/vault.go +++ b/nomad/structs/config/vault.go @@ -6,7 +6,7 @@ package config import ( "time" - "github.com/hashicorp/nomad/helper/pointer" + "github.com/hashicorp/nomad/v2/helper/pointer" vault "github.com/hashicorp/vault/api" ) diff --git a/nomad/structs/config/vault_test.go b/nomad/structs/config/vault_test.go index 34a1eeda044..b1491c567af 100644 --- a/nomad/structs/config/vault_test.go +++ b/nomad/structs/config/vault_test.go @@ -8,7 +8,7 @@ import ( "testing" "time" - "github.com/hashicorp/nomad/ci" + "github.com/hashicorp/nomad/v2/ci" "github.com/shoenig/test/must" ) diff --git a/nomad/structs/config/workload_id.go b/nomad/structs/config/workload_id.go index 3eb68ba5841..7f383289107 100644 --- a/nomad/structs/config/workload_id.go +++ b/nomad/structs/config/workload_id.go @@ -9,7 +9,7 @@ import ( "time" "github.com/hashicorp/go-set/v3" - "github.com/hashicorp/nomad/helper/pointer" + "github.com/hashicorp/nomad/v2/helper/pointer" ) // WorkloadIdentityConfig is the agent configuration block used to define diff --git a/nomad/structs/config/workload_id_test.go b/nomad/structs/config/workload_id_test.go index 7c9bddd84a3..ab5c23e253e 100644 --- a/nomad/structs/config/workload_id_test.go +++ b/nomad/structs/config/workload_id_test.go @@ -7,7 +7,7 @@ import ( "testing" "time" - "github.com/hashicorp/nomad/ci" + "github.com/hashicorp/nomad/v2/ci" "github.com/shoenig/test/must" ) diff --git a/nomad/structs/connect.go b/nomad/structs/connect.go index c76c0d09109..b45d2c9ff1a 100644 --- a/nomad/structs/connect.go +++ b/nomad/structs/connect.go @@ -10,7 +10,7 @@ import ( "strconv" "github.com/hashicorp/go-multierror" - "github.com/hashicorp/nomad/helper" + "github.com/hashicorp/nomad/v2/helper" ) // ConsulConfigEntries represents Consul ConfigEntry definitions from a job for diff --git a/nomad/structs/connect_test.go b/nomad/structs/connect_test.go index e72a4622031..2215ca9b897 100644 --- a/nomad/structs/connect_test.go +++ b/nomad/structs/connect_test.go @@ -6,7 +6,7 @@ package structs import ( "testing" - "github.com/hashicorp/nomad/ci" + "github.com/hashicorp/nomad/v2/ci" "github.com/shoenig/test/must" "github.com/stretchr/testify/require" ) diff --git a/nomad/structs/constraint_test.go b/nomad/structs/constraint_test.go index 716ef167dfd..b4a48d24b96 100644 --- a/nomad/structs/constraint_test.go +++ b/nomad/structs/constraint_test.go @@ -5,7 +5,7 @@ package structs import ( "testing" - "github.com/hashicorp/nomad/ci" + "github.com/hashicorp/nomad/v2/ci" "github.com/shoenig/test/must" ) diff --git a/nomad/structs/consul_ce_test.go b/nomad/structs/consul_ce_test.go index 15139a74769..8e7339eee12 100644 --- a/nomad/structs/consul_ce_test.go +++ b/nomad/structs/consul_ce_test.go @@ -9,7 +9,7 @@ package structs import ( "testing" - "github.com/hashicorp/nomad/ci" + "github.com/hashicorp/nomad/v2/ci" "github.com/stretchr/testify/require" ) diff --git a/nomad/structs/consul_test.go b/nomad/structs/consul_test.go index 7dd582b3866..cda67deba06 100644 --- a/nomad/structs/consul_test.go +++ b/nomad/structs/consul_test.go @@ -6,7 +6,7 @@ package structs import ( "testing" - "github.com/hashicorp/nomad/ci" + "github.com/hashicorp/nomad/v2/ci" "github.com/stretchr/testify/require" ) diff --git a/nomad/structs/cpucompat_default.go b/nomad/structs/cpucompat_default.go index 0a4d6515d25..ba369ceb2f4 100644 --- a/nomad/structs/cpucompat_default.go +++ b/nomad/structs/cpucompat_default.go @@ -6,7 +6,7 @@ package structs import ( - "github.com/hashicorp/nomad/client/lib/numalib" + "github.com/hashicorp/nomad/v2/client/lib/numalib" ) // Compatibility will translate the LegacyNodeCpuResources into NodeProcessor diff --git a/nomad/structs/cpucompat_default_test.go b/nomad/structs/cpucompat_default_test.go index d5856d8325c..a33a15c945b 100644 --- a/nomad/structs/cpucompat_default_test.go +++ b/nomad/structs/cpucompat_default_test.go @@ -8,10 +8,10 @@ package structs import ( "testing" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/client/lib/idset" - "github.com/hashicorp/nomad/client/lib/numalib" - "github.com/hashicorp/nomad/client/lib/numalib/hw" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/client/lib/idset" + "github.com/hashicorp/nomad/v2/client/lib/numalib" + "github.com/hashicorp/nomad/v2/client/lib/numalib/hw" "github.com/shoenig/test/must" ) diff --git a/nomad/structs/cpucompat_generic.go b/nomad/structs/cpucompat_generic.go index 4f6420941c2..35369ae23a5 100644 --- a/nomad/structs/cpucompat_generic.go +++ b/nomad/structs/cpucompat_generic.go @@ -4,9 +4,9 @@ package structs import ( - "github.com/hashicorp/nomad/client/lib/idset" - "github.com/hashicorp/nomad/client/lib/numalib" - "github.com/hashicorp/nomad/client/lib/numalib/hw" + "github.com/hashicorp/nomad/v2/client/lib/idset" + "github.com/hashicorp/nomad/v2/client/lib/numalib" + "github.com/hashicorp/nomad/v2/client/lib/numalib/hw" ) func topologyFromLegacyGeneric(old LegacyNodeCpuResources) *numalib.Topology { diff --git a/nomad/structs/cpucompat_linux.go b/nomad/structs/cpucompat_linux.go index 593d7b52211..fc37a13f3f2 100644 --- a/nomad/structs/cpucompat_linux.go +++ b/nomad/structs/cpucompat_linux.go @@ -6,10 +6,10 @@ package structs import ( - "github.com/hashicorp/nomad/client/lib/idset" - "github.com/hashicorp/nomad/client/lib/numalib" - "github.com/hashicorp/nomad/client/lib/numalib/hw" - "github.com/hashicorp/nomad/helper" + "github.com/hashicorp/nomad/v2/client/lib/idset" + "github.com/hashicorp/nomad/v2/client/lib/numalib" + "github.com/hashicorp/nomad/v2/client/lib/numalib/hw" + "github.com/hashicorp/nomad/v2/helper" ) // Compatibility will translate the LegacyNodeCpuResources into NodeProcessor diff --git a/nomad/structs/cpucompat_linux_test.go b/nomad/structs/cpucompat_linux_test.go index f238f10eb46..ffd810ec0e4 100644 --- a/nomad/structs/cpucompat_linux_test.go +++ b/nomad/structs/cpucompat_linux_test.go @@ -8,10 +8,10 @@ package structs import ( "testing" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/client/lib/idset" - "github.com/hashicorp/nomad/client/lib/numalib" - "github.com/hashicorp/nomad/client/lib/numalib/hw" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/client/lib/idset" + "github.com/hashicorp/nomad/v2/client/lib/numalib" + "github.com/hashicorp/nomad/v2/client/lib/numalib/hw" "github.com/shoenig/test/must" ) diff --git a/nomad/structs/csi.go b/nomad/structs/csi.go index c89ba24b8fb..b9cd82fc69e 100644 --- a/nomad/structs/csi.go +++ b/nomad/structs/csi.go @@ -13,7 +13,7 @@ import ( multierror "github.com/hashicorp/go-multierror" - "github.com/hashicorp/nomad/helper" + "github.com/hashicorp/nomad/v2/helper" ) // CSISocketName is the filename that Nomad expects plugins to create inside the diff --git a/nomad/structs/csi_test.go b/nomad/structs/csi_test.go index 3b5107cf73f..affcca9b9dc 100644 --- a/nomad/structs/csi_test.go +++ b/nomad/structs/csi_test.go @@ -8,7 +8,7 @@ import ( "testing" "time" - "github.com/hashicorp/nomad/ci" + "github.com/hashicorp/nomad/v2/ci" "github.com/shoenig/test" "github.com/shoenig/test/must" "github.com/stretchr/testify/require" diff --git a/nomad/structs/deployment.go b/nomad/structs/deployment.go index 1224ae21c3d..17d2dbfe541 100644 --- a/nomad/structs/deployment.go +++ b/nomad/structs/deployment.go @@ -8,7 +8,7 @@ import ( "slices" "time" - "github.com/hashicorp/nomad/helper/uuid" + "github.com/hashicorp/nomad/v2/helper/uuid" ) const ( diff --git a/nomad/structs/devices_test.go b/nomad/structs/devices_test.go index 694d98a534a..6cdb640a8ee 100644 --- a/nomad/structs/devices_test.go +++ b/nomad/structs/devices_test.go @@ -6,9 +6,9 @@ package structs import ( "testing" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/helper/uuid" - psstructs "github.com/hashicorp/nomad/plugins/shared/structs" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/helper/uuid" + psstructs "github.com/hashicorp/nomad/v2/plugins/shared/structs" "github.com/shoenig/test/must" "github.com/stretchr/testify/require" ) diff --git a/nomad/structs/diff.go b/nomad/structs/diff.go index 870f53a64d5..fda4b8d61be 100644 --- a/nomad/structs/diff.go +++ b/nomad/structs/diff.go @@ -11,8 +11,8 @@ import ( "strconv" "strings" - "github.com/hashicorp/nomad/helper" - "github.com/hashicorp/nomad/helper/flatmap" + "github.com/hashicorp/nomad/v2/helper" + "github.com/hashicorp/nomad/v2/helper/flatmap" "github.com/mitchellh/hashstructure" ) diff --git a/nomad/structs/diff_test.go b/nomad/structs/diff_test.go index 6d4d03a6fd1..ca10d072e49 100644 --- a/nomad/structs/diff_test.go +++ b/nomad/structs/diff_test.go @@ -8,7 +8,7 @@ import ( "testing" "time" - "github.com/hashicorp/nomad/ci" + "github.com/hashicorp/nomad/v2/ci" "github.com/shoenig/test/must" ) diff --git a/nomad/structs/errors_test.go b/nomad/structs/errors_test.go index 9a2c33e1a4a..8b07e7b13ee 100644 --- a/nomad/structs/errors_test.go +++ b/nomad/structs/errors_test.go @@ -7,7 +7,7 @@ import ( "errors" "testing" - "github.com/hashicorp/nomad/ci" + "github.com/hashicorp/nomad/v2/ci" "github.com/stretchr/testify/assert" ) diff --git a/nomad/structs/eval.go b/nomad/structs/eval.go index f21b233161a..1dc39f83555 100644 --- a/nomad/structs/eval.go +++ b/nomad/structs/eval.go @@ -7,7 +7,7 @@ import ( "fmt" "time" - "github.com/hashicorp/nomad/helper/uuid" + "github.com/hashicorp/nomad/v2/helper/uuid" ) const ( diff --git a/nomad/structs/extensions.go b/nomad/structs/extensions.go index 6314ba08a9b..5d28a1125a2 100644 --- a/nomad/structs/extensions.go +++ b/nomad/structs/extensions.go @@ -6,9 +6,9 @@ package structs import ( "reflect" - "github.com/hashicorp/nomad/client/lib/numalib" - "github.com/hashicorp/nomad/client/lib/numalib/hw" - "github.com/hashicorp/nomad/helper" + "github.com/hashicorp/nomad/v2/client/lib/numalib" + "github.com/hashicorp/nomad/v2/client/lib/numalib/hw" + "github.com/hashicorp/nomad/v2/helper" ) var ( diff --git a/nomad/structs/funcs.go b/nomad/structs/funcs.go index 1240768ae38..1dd1b83b91d 100644 --- a/nomad/structs/funcs.go +++ b/nomad/structs/funcs.go @@ -15,7 +15,7 @@ import ( "strings" "github.com/hashicorp/go-set/v3" - "github.com/hashicorp/nomad/acl" + "github.com/hashicorp/nomad/v2/acl" "golang.org/x/crypto/blake2b" ) diff --git a/nomad/structs/funcs_test.go b/nomad/structs/funcs_test.go index 60eb0735a7c..f977a13c5ae 100644 --- a/nomad/structs/funcs_test.go +++ b/nomad/structs/funcs_test.go @@ -9,12 +9,12 @@ import ( "testing" "time" - "github.com/hashicorp/nomad/acl" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/client/lib/idset" - "github.com/hashicorp/nomad/client/lib/numalib" - "github.com/hashicorp/nomad/client/lib/numalib/hw" - "github.com/hashicorp/nomad/helper/uuid" + "github.com/hashicorp/nomad/v2/acl" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/client/lib/idset" + "github.com/hashicorp/nomad/v2/client/lib/numalib" + "github.com/hashicorp/nomad/v2/client/lib/numalib/hw" + "github.com/hashicorp/nomad/v2/helper/uuid" "github.com/shoenig/test" "github.com/shoenig/test/must" "github.com/stretchr/testify/assert" diff --git a/nomad/structs/group_test.go b/nomad/structs/group_test.go index b0f750c8334..c17e4aa1216 100644 --- a/nomad/structs/group_test.go +++ b/nomad/structs/group_test.go @@ -8,7 +8,7 @@ import ( "testing" "time" - "github.com/hashicorp/nomad/ci" + "github.com/hashicorp/nomad/v2/ci" "github.com/shoenig/test/must" ) diff --git a/nomad/structs/host_volumes.go b/nomad/structs/host_volumes.go index cdae0bbfac6..95796d510e8 100644 --- a/nomad/structs/host_volumes.go +++ b/nomad/structs/host_volumes.go @@ -11,8 +11,8 @@ import ( "time" "github.com/hashicorp/go-multierror" - "github.com/hashicorp/nomad/helper" - "github.com/hashicorp/nomad/helper/uuid" + "github.com/hashicorp/nomad/v2/helper" + "github.com/hashicorp/nomad/v2/helper/uuid" ) type HostVolume struct { diff --git a/nomad/structs/host_volumes_test.go b/nomad/structs/host_volumes_test.go index 086c4e01aff..8ae18fa39aa 100644 --- a/nomad/structs/host_volumes_test.go +++ b/nomad/structs/host_volumes_test.go @@ -7,8 +7,8 @@ import ( "testing" "time" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/helper/uuid" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/helper/uuid" "github.com/shoenig/test/must" ) diff --git a/nomad/structs/identity_test.go b/nomad/structs/identity_test.go index 016d2722813..b79be66299f 100644 --- a/nomad/structs/identity_test.go +++ b/nomad/structs/identity_test.go @@ -8,7 +8,7 @@ import ( "time" "github.com/go-jose/go-jose/v3/jwt" - "github.com/hashicorp/nomad/ci" + "github.com/hashicorp/nomad/v2/ci" "github.com/shoenig/test/must" ) diff --git a/nomad/structs/keyring.go b/nomad/structs/keyring.go index 11fd901ae35..e9c1ad6d83c 100644 --- a/nomad/structs/keyring.go +++ b/nomad/structs/keyring.go @@ -17,9 +17,9 @@ import ( "github.com/go-jose/go-jose/v3" "github.com/golang/protobuf/proto" wrapping "github.com/hashicorp/go-kms-wrapping/v2" - "github.com/hashicorp/nomad/helper" - "github.com/hashicorp/nomad/helper/crypto" - "github.com/hashicorp/nomad/helper/uuid" + "github.com/hashicorp/nomad/v2/helper" + "github.com/hashicorp/nomad/v2/helper/crypto" + "github.com/hashicorp/nomad/v2/helper/uuid" ) const ( diff --git a/nomad/structs/keyring_test.go b/nomad/structs/keyring_test.go index 5fafc753e09..c29db671ef6 100644 --- a/nomad/structs/keyring_test.go +++ b/nomad/structs/keyring_test.go @@ -6,7 +6,7 @@ package structs import ( "testing" - "github.com/hashicorp/nomad/ci" + "github.com/hashicorp/nomad/v2/ci" "github.com/shoenig/test/must" ) diff --git a/nomad/structs/network_test.go b/nomad/structs/network_test.go index 4d02657cfdc..a6ce9abcbe8 100644 --- a/nomad/structs/network_test.go +++ b/nomad/structs/network_test.go @@ -9,7 +9,7 @@ import ( "reflect" "testing" - "github.com/hashicorp/nomad/ci" + "github.com/hashicorp/nomad/v2/ci" "github.com/shoenig/test/must" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/nomad/structs/node.go b/nomad/structs/node.go index c40cac9076d..067461a247d 100644 --- a/nomad/structs/node.go +++ b/nomad/structs/node.go @@ -16,7 +16,7 @@ import ( "github.com/hashicorp/go-multierror" "github.com/hashicorp/go-version" "github.com/hashicorp/hcl/v2/hclsyntax" - "github.com/hashicorp/nomad/helper/uuid" + "github.com/hashicorp/nomad/v2/helper/uuid" ) // minNodeIdentityNomadNodeVersion is the minimum Nomad version that supports diff --git a/nomad/structs/node_class_test.go b/nomad/structs/node_class_test.go index 5e547cdf3d4..1ab7a9a217f 100644 --- a/nomad/structs/node_class_test.go +++ b/nomad/structs/node_class_test.go @@ -6,9 +6,9 @@ package structs import ( "testing" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/helper/uuid" - psstructs "github.com/hashicorp/nomad/plugins/shared/structs" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/helper/uuid" + psstructs "github.com/hashicorp/nomad/v2/plugins/shared/structs" "github.com/shoenig/test/must" "github.com/stretchr/testify/require" ) diff --git a/nomad/structs/node_pool_ce_test.go b/nomad/structs/node_pool_ce_test.go index 19b089fff73..89afa0629f9 100644 --- a/nomad/structs/node_pool_ce_test.go +++ b/nomad/structs/node_pool_ce_test.go @@ -9,7 +9,7 @@ package structs import ( "testing" - "github.com/hashicorp/nomad/ci" + "github.com/hashicorp/nomad/v2/ci" "github.com/shoenig/test/must" ) diff --git a/nomad/structs/node_pool_test.go b/nomad/structs/node_pool_test.go index 43c9bae734a..6e5143da1f2 100644 --- a/nomad/structs/node_pool_test.go +++ b/nomad/structs/node_pool_test.go @@ -8,7 +8,7 @@ import ( "testing" "time" - "github.com/hashicorp/nomad/ci" + "github.com/hashicorp/nomad/v2/ci" "github.com/shoenig/test/must" ) diff --git a/nomad/structs/node_test.go b/nomad/structs/node_test.go index 760f4eef6ed..f8e821e3954 100644 --- a/nomad/structs/node_test.go +++ b/nomad/structs/node_test.go @@ -10,7 +10,7 @@ import ( "github.com/go-jose/go-jose/v3/jwt" "github.com/hashicorp/go-version" - "github.com/hashicorp/nomad/ci" + "github.com/hashicorp/nomad/v2/ci" "github.com/shoenig/test/must" "github.com/stretchr/testify/require" ) diff --git a/nomad/structs/numa.go b/nomad/structs/numa.go index 841ef81dfa9..7c54eb05f4e 100644 --- a/nomad/structs/numa.go +++ b/nomad/structs/numa.go @@ -8,7 +8,7 @@ import ( "fmt" "slices" - "github.com/hashicorp/nomad/client/lib/numalib" + "github.com/hashicorp/nomad/v2/client/lib/numalib" ) const ( diff --git a/nomad/structs/numa_test.go b/nomad/structs/numa_test.go index c339b46cd54..79a1d442d07 100644 --- a/nomad/structs/numa_test.go +++ b/nomad/structs/numa_test.go @@ -7,9 +7,9 @@ import ( "errors" "testing" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/client/lib/numalib" - "github.com/hashicorp/nomad/client/lib/numalib/hw" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/client/lib/numalib" + "github.com/hashicorp/nomad/v2/client/lib/numalib/hw" "github.com/shoenig/test/must" ) diff --git a/nomad/structs/operator_test.go b/nomad/structs/operator_test.go index d198787d9a5..9ee5f4e8a20 100644 --- a/nomad/structs/operator_test.go +++ b/nomad/structs/operator_test.go @@ -6,7 +6,7 @@ package structs import ( "testing" - "github.com/hashicorp/nomad/ci" + "github.com/hashicorp/nomad/v2/ci" "github.com/shoenig/test/must" ) diff --git a/nomad/structs/plan_test.go b/nomad/structs/plan_test.go index fff1d799279..a031c2029b1 100644 --- a/nomad/structs/plan_test.go +++ b/nomad/structs/plan_test.go @@ -8,8 +8,8 @@ import ( "testing" "time" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/helper/uuid" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/helper/uuid" "github.com/shoenig/test/must" ) diff --git a/nomad/structs/service_registration.go b/nomad/structs/service_registration.go index 97f681f825b..deefb9cf424 100644 --- a/nomad/structs/service_registration.go +++ b/nomad/structs/service_registration.go @@ -9,8 +9,8 @@ import ( "fmt" "slices" - "github.com/hashicorp/nomad/helper" - "github.com/hashicorp/nomad/helper/ipaddr" + "github.com/hashicorp/nomad/v2/helper" + "github.com/hashicorp/nomad/v2/helper/ipaddr" ) const ( diff --git a/nomad/structs/services.go b/nomad/structs/services.go index 46360d2a1e5..d54ff817b0d 100644 --- a/nomad/structs/services.go +++ b/nomad/structs/services.go @@ -23,9 +23,9 @@ import ( "github.com/hashicorp/consul/api" "github.com/hashicorp/go-multierror" "github.com/hashicorp/go-set/v3" - "github.com/hashicorp/nomad/helper" - "github.com/hashicorp/nomad/helper/args" - "github.com/hashicorp/nomad/helper/pointer" + "github.com/hashicorp/nomad/v2/helper" + "github.com/hashicorp/nomad/v2/helper/args" + "github.com/hashicorp/nomad/v2/helper/pointer" "github.com/mitchellh/copystructure" ) diff --git a/nomad/structs/services_test.go b/nomad/structs/services_test.go index 681eb2f9343..d218b320829 100644 --- a/nomad/structs/services_test.go +++ b/nomad/structs/services_test.go @@ -10,7 +10,7 @@ import ( "time" "github.com/hashicorp/go-multierror" - "github.com/hashicorp/nomad/ci" + "github.com/hashicorp/nomad/v2/ci" "github.com/shoenig/test/must" "github.com/stretchr/testify/require" ) diff --git a/nomad/structs/structs.go b/nomad/structs/structs.go index 589548bc49e..14288ab8588 100644 --- a/nomad/structs/structs.go +++ b/nomad/structs/structs.go @@ -33,18 +33,18 @@ import ( "github.com/hashicorp/go-multierror" "github.com/hashicorp/go-set/v3" "github.com/hashicorp/go-version" - "github.com/hashicorp/nomad/client/lib/idset" - "github.com/hashicorp/nomad/client/lib/numalib" - "github.com/hashicorp/nomad/client/lib/numalib/hw" - "github.com/hashicorp/nomad/command/agent/host" - "github.com/hashicorp/nomad/command/agent/pprof" - "github.com/hashicorp/nomad/helper" - "github.com/hashicorp/nomad/helper/args" - "github.com/hashicorp/nomad/helper/constraints/semver" - "github.com/hashicorp/nomad/helper/escapingfs" - "github.com/hashicorp/nomad/helper/pointer" - "github.com/hashicorp/nomad/helper/uuid" - psstructs "github.com/hashicorp/nomad/plugins/shared/structs" + "github.com/hashicorp/nomad/v2/client/lib/idset" + "github.com/hashicorp/nomad/v2/client/lib/numalib" + "github.com/hashicorp/nomad/v2/client/lib/numalib/hw" + "github.com/hashicorp/nomad/v2/command/agent/host" + "github.com/hashicorp/nomad/v2/command/agent/pprof" + "github.com/hashicorp/nomad/v2/helper" + "github.com/hashicorp/nomad/v2/helper/args" + "github.com/hashicorp/nomad/v2/helper/constraints/semver" + "github.com/hashicorp/nomad/v2/helper/escapingfs" + "github.com/hashicorp/nomad/v2/helper/pointer" + "github.com/hashicorp/nomad/v2/helper/uuid" + psstructs "github.com/hashicorp/nomad/v2/plugins/shared/structs" "github.com/miekg/dns" "github.com/mitchellh/copystructure" "github.com/ryanuber/go-glob" diff --git a/nomad/structs/structs_ce_test.go b/nomad/structs/structs_ce_test.go index f68b6f30284..2b595de72cc 100644 --- a/nomad/structs/structs_ce_test.go +++ b/nomad/structs/structs_ce_test.go @@ -9,7 +9,7 @@ package structs import ( "testing" - "github.com/hashicorp/nomad/ci" + "github.com/hashicorp/nomad/v2/ci" "github.com/shoenig/test/must" ) diff --git a/nomad/structs/structs_periodic_test.go b/nomad/structs/structs_periodic_test.go index 6a266d1a8fc..2b47044785f 100644 --- a/nomad/structs/structs_periodic_test.go +++ b/nomad/structs/structs_periodic_test.go @@ -9,7 +9,7 @@ import ( "testing" "time" - "github.com/hashicorp/nomad/ci" + "github.com/hashicorp/nomad/v2/ci" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/nomad/structs/structs_test.go b/nomad/structs/structs_test.go index 2f66c9c2de0..79862e49352 100644 --- a/nomad/structs/structs_test.go +++ b/nomad/structs/structs_test.go @@ -15,11 +15,11 @@ import ( "github.com/hashicorp/consul/api" "github.com/hashicorp/go-multierror" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/client/lib/idset" - "github.com/hashicorp/nomad/client/lib/numalib/hw" - "github.com/hashicorp/nomad/helper/uuid" - psstructs "github.com/hashicorp/nomad/plugins/shared/structs" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/client/lib/idset" + "github.com/hashicorp/nomad/v2/client/lib/numalib/hw" + "github.com/hashicorp/nomad/v2/helper/uuid" + psstructs "github.com/hashicorp/nomad/v2/plugins/shared/structs" "github.com/kr/pretty" "github.com/shoenig/test/must" "github.com/stretchr/testify/assert" diff --git a/nomad/structs/task_sched_test.go b/nomad/structs/task_sched_test.go index 092fca4c0c4..b90899360c5 100644 --- a/nomad/structs/task_sched_test.go +++ b/nomad/structs/task_sched_test.go @@ -7,7 +7,7 @@ import ( "testing" "time" - "github.com/hashicorp/nomad/ci" + "github.com/hashicorp/nomad/v2/ci" "github.com/shoenig/test" "github.com/shoenig/test/must" ) diff --git a/nomad/structs/testing.go b/nomad/structs/testing.go index 1c37ae0ccb9..a87460bdec0 100644 --- a/nomad/structs/testing.go +++ b/nomad/structs/testing.go @@ -7,11 +7,11 @@ import ( "fmt" "time" - "github.com/hashicorp/nomad/client/lib/idset" - "github.com/hashicorp/nomad/client/lib/numalib" - "github.com/hashicorp/nomad/client/lib/numalib/hw" - "github.com/hashicorp/nomad/helper/uuid" - psstructs "github.com/hashicorp/nomad/plugins/shared/structs" + "github.com/hashicorp/nomad/v2/client/lib/idset" + "github.com/hashicorp/nomad/v2/client/lib/numalib" + "github.com/hashicorp/nomad/v2/client/lib/numalib/hw" + "github.com/hashicorp/nomad/v2/helper/uuid" + psstructs "github.com/hashicorp/nomad/v2/plugins/shared/structs" ) // NodeResourcesToAllocatedResources converts a node resources to an allocated diff --git a/nomad/structs/variables.go b/nomad/structs/variables.go index 5ac7446f880..78ad9c27762 100644 --- a/nomad/structs/variables.go +++ b/nomad/structs/variables.go @@ -14,7 +14,7 @@ import ( "time" "github.com/hashicorp/go-multierror" - "github.com/hashicorp/nomad/helper/uuid" + "github.com/hashicorp/nomad/v2/helper/uuid" ) const ( diff --git a/nomad/structs/variables_test.go b/nomad/structs/variables_test.go index 3ca7a73371c..364cdc372a4 100644 --- a/nomad/structs/variables_test.go +++ b/nomad/structs/variables_test.go @@ -9,7 +9,7 @@ import ( "testing" "time" - "github.com/hashicorp/nomad/ci" + "github.com/hashicorp/nomad/v2/ci" "github.com/shoenig/test/must" ) diff --git a/nomad/structs/volumes_test.go b/nomad/structs/volumes_test.go index 63587fe9a2a..ff4430932eb 100644 --- a/nomad/structs/volumes_test.go +++ b/nomad/structs/volumes_test.go @@ -7,7 +7,7 @@ import ( "errors" "testing" - "github.com/hashicorp/nomad/ci" + "github.com/hashicorp/nomad/v2/ci" "github.com/shoenig/test/must" ) diff --git a/nomad/structs/workload_id.go b/nomad/structs/workload_id.go index 4cf61826a2e..58022211374 100644 --- a/nomad/structs/workload_id.go +++ b/nomad/structs/workload_id.go @@ -14,7 +14,7 @@ import ( jwt "github.com/go-jose/go-jose/v3/jwt" "github.com/hashicorp/go-multierror" "github.com/hashicorp/go-version" - "github.com/hashicorp/nomad/helper/uuid" + "github.com/hashicorp/nomad/v2/helper/uuid" ) const ( diff --git a/nomad/structs/workload_id_test.go b/nomad/structs/workload_id_test.go index 32f7a2a3425..9cb88cc7f5e 100644 --- a/nomad/structs/workload_id_test.go +++ b/nomad/structs/workload_id_test.go @@ -10,8 +10,8 @@ import ( jwt "github.com/go-jose/go-jose/v3/jwt" "github.com/google/go-cmp/cmp/cmpopts" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/helper/uuid" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/helper/uuid" "github.com/shoenig/test/must" ) diff --git a/nomad/system_endpoint.go b/nomad/system_endpoint.go index 67bf6182383..45a92eb8af2 100644 --- a/nomad/system_endpoint.go +++ b/nomad/system_endpoint.go @@ -8,7 +8,7 @@ import ( "github.com/hashicorp/go-hclog" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/nomad/structs" ) // System endpoint is used to call invoke system tasks. diff --git a/nomad/system_endpoint_test.go b/nomad/system_endpoint_test.go index 8c286a8e55e..a3d332909e1 100644 --- a/nomad/system_endpoint_test.go +++ b/nomad/system_endpoint_test.go @@ -11,11 +11,11 @@ import ( memdb "github.com/hashicorp/go-memdb" msgpackrpc "github.com/hashicorp/net-rpc-msgpackrpc/v2" - "github.com/hashicorp/nomad/acl" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/testutil" + "github.com/hashicorp/nomad/v2/acl" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/testutil" "github.com/shoenig/test/must" "github.com/shoenig/test/wait" "github.com/stretchr/testify/assert" diff --git a/nomad/task_group_host_volume_claim_endpoint.go b/nomad/task_group_host_volume_claim_endpoint.go index 0d8e4545df8..5bd9e71dac5 100644 --- a/nomad/task_group_host_volume_claim_endpoint.go +++ b/nomad/task_group_host_volume_claim_endpoint.go @@ -12,10 +12,10 @@ import ( "github.com/hashicorp/go-hclog" "github.com/hashicorp/go-memdb" metrics "github.com/hashicorp/go-metrics/compat" - "github.com/hashicorp/nomad/acl" - "github.com/hashicorp/nomad/nomad/state" - "github.com/hashicorp/nomad/nomad/state/paginator" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/acl" + "github.com/hashicorp/nomad/v2/nomad/state" + "github.com/hashicorp/nomad/v2/nomad/state/paginator" + "github.com/hashicorp/nomad/v2/nomad/structs" ) // TaskGroupHostVolumeClaim is the server RPC endpoint for task group volume claims diff --git a/nomad/task_group_host_volume_claim_endpoint_test.go b/nomad/task_group_host_volume_claim_endpoint_test.go index 4ad67b7641e..42465040c2f 100644 --- a/nomad/task_group_host_volume_claim_endpoint_test.go +++ b/nomad/task_group_host_volume_claim_endpoint_test.go @@ -9,11 +9,11 @@ import ( "github.com/hashicorp/go-memdb" msgpackrpc "github.com/hashicorp/net-rpc-msgpackrpc/v2" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/testutil" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/testutil" "github.com/shoenig/test/must" ) diff --git a/nomad/testing.go b/nomad/testing.go index 00ce0b358b0..783f55063af 100644 --- a/nomad/testing.go +++ b/nomad/testing.go @@ -11,13 +11,13 @@ import ( "testing" "time" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/command/agent/consul" - "github.com/hashicorp/nomad/helper/testlog" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" - structsconfig "github.com/hashicorp/nomad/nomad/structs/config" - "github.com/hashicorp/nomad/version" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/command/agent/consul" + "github.com/hashicorp/nomad/v2/helper/testlog" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" + structsconfig "github.com/hashicorp/nomad/v2/nomad/structs/config" + "github.com/hashicorp/nomad/v2/version" "github.com/shoenig/test/must" ) diff --git a/nomad/util.go b/nomad/util.go index 9c34db5f23c..46be605e1a7 100644 --- a/nomad/util.go +++ b/nomad/util.go @@ -11,8 +11,8 @@ import ( memdb "github.com/hashicorp/go-memdb" version "github.com/hashicorp/go-version" - "github.com/hashicorp/nomad/nomad/state" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/nomad/state" + "github.com/hashicorp/nomad/v2/nomad/structs" ) const ( diff --git a/nomad/util_test.go b/nomad/util_test.go index 1c79e1a7ef1..e05755796ae 100644 --- a/nomad/util_test.go +++ b/nomad/util_test.go @@ -7,8 +7,8 @@ import ( "reflect" "testing" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/helper/uuid" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/helper/uuid" "github.com/stretchr/testify/require" ) diff --git a/nomad/variables_endpoint.go b/nomad/variables_endpoint.go index 98d4e9797f0..3ce91c286d2 100644 --- a/nomad/variables_endpoint.go +++ b/nomad/variables_endpoint.go @@ -14,11 +14,11 @@ import ( "github.com/hashicorp/go-memdb" metrics "github.com/hashicorp/go-metrics/compat" - "github.com/hashicorp/nomad/acl" - "github.com/hashicorp/nomad/nomad/auth" - "github.com/hashicorp/nomad/nomad/state" - "github.com/hashicorp/nomad/nomad/state/paginator" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/acl" + "github.com/hashicorp/nomad/v2/nomad/auth" + "github.com/hashicorp/nomad/v2/nomad/state" + "github.com/hashicorp/nomad/v2/nomad/state/paginator" + "github.com/hashicorp/nomad/v2/nomad/structs" ) const ( diff --git a/nomad/variables_endpoint_test.go b/nomad/variables_endpoint_test.go index a67cc889e94..f058f694aa6 100644 --- a/nomad/variables_endpoint_test.go +++ b/nomad/variables_endpoint_test.go @@ -14,13 +14,13 @@ import ( msgpackrpc "github.com/hashicorp/net-rpc-msgpackrpc/v2" "github.com/shoenig/test/must" - "github.com/hashicorp/nomad/acl" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/nomad/auth" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/testutil" + "github.com/hashicorp/nomad/v2/acl" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/nomad/auth" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/testutil" ) func TestVariablesEndpoint_GetVariable_Blocking(t *testing.T) { diff --git a/nomad/volumewatcher/interfaces.go b/nomad/volumewatcher/interfaces.go index 4c9f10f5a28..7db79a81b3e 100644 --- a/nomad/volumewatcher/interfaces.go +++ b/nomad/volumewatcher/interfaces.go @@ -4,7 +4,7 @@ package volumewatcher import ( - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/nomad/structs" ) // CSIVolumeRPC is a minimal interface of the Server, intended as an aid diff --git a/nomad/volumewatcher/interfaces_test.go b/nomad/volumewatcher/interfaces_test.go index ee444ae4d09..20bf1a5b37b 100644 --- a/nomad/volumewatcher/interfaces_test.go +++ b/nomad/volumewatcher/interfaces_test.go @@ -6,9 +6,9 @@ package volumewatcher import ( "sync/atomic" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/state" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/state" + "github.com/hashicorp/nomad/v2/nomad/structs" ) // Create a client node with plugin info diff --git a/nomad/volumewatcher/volume_watcher.go b/nomad/volumewatcher/volume_watcher.go index 24ec85f3c61..87a0b013b14 100644 --- a/nomad/volumewatcher/volume_watcher.go +++ b/nomad/volumewatcher/volume_watcher.go @@ -11,9 +11,9 @@ import ( log "github.com/hashicorp/go-hclog" memdb "github.com/hashicorp/go-memdb" multierror "github.com/hashicorp/go-multierror" - "github.com/hashicorp/nomad/helper" - "github.com/hashicorp/nomad/nomad/state" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/helper" + "github.com/hashicorp/nomad/v2/nomad/state" + "github.com/hashicorp/nomad/v2/nomad/structs" "golang.org/x/time/rate" ) diff --git a/nomad/volumewatcher/volume_watcher_test.go b/nomad/volumewatcher/volume_watcher_test.go index 95e237d24a6..81cdd81fb63 100644 --- a/nomad/volumewatcher/volume_watcher_test.go +++ b/nomad/volumewatcher/volume_watcher_test.go @@ -7,11 +7,11 @@ import ( "context" "testing" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/helper/testlog" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/state" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/helper/testlog" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/state" + "github.com/hashicorp/nomad/v2/nomad/structs" "github.com/shoenig/test/must" ) diff --git a/nomad/volumewatcher/volumes_watcher.go b/nomad/volumewatcher/volumes_watcher.go index eea78ba8f0b..192b252cd53 100644 --- a/nomad/volumewatcher/volumes_watcher.go +++ b/nomad/volumewatcher/volumes_watcher.go @@ -10,8 +10,8 @@ import ( log "github.com/hashicorp/go-hclog" memdb "github.com/hashicorp/go-memdb" - "github.com/hashicorp/nomad/nomad/state" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/nomad/state" + "github.com/hashicorp/nomad/v2/nomad/structs" ) // Watcher is used to watch volumes and their allocations created diff --git a/nomad/volumewatcher/volumes_watcher_test.go b/nomad/volumewatcher/volumes_watcher_test.go index 939e8359e87..b66a6d00f3c 100644 --- a/nomad/volumewatcher/volumes_watcher_test.go +++ b/nomad/volumewatcher/volumes_watcher_test.go @@ -8,11 +8,11 @@ import ( "time" memdb "github.com/hashicorp/go-memdb" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/helper/testlog" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/state" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/helper/testlog" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/state" + "github.com/hashicorp/nomad/v2/nomad/structs" "github.com/shoenig/test/must" "github.com/shoenig/test/wait" ) diff --git a/nomad/worker.go b/nomad/worker.go index 8b316b51d43..c2616522e84 100644 --- a/nomad/worker.go +++ b/nomad/worker.go @@ -16,12 +16,12 @@ import ( memdb "github.com/hashicorp/go-memdb" metrics "github.com/hashicorp/go-metrics/compat" "github.com/hashicorp/go-version" - "github.com/hashicorp/nomad/helper" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/nomad/state" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/scheduler" - sstructs "github.com/hashicorp/nomad/scheduler/structs" + "github.com/hashicorp/nomad/v2/helper" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/nomad/state" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/scheduler" + sstructs "github.com/hashicorp/nomad/v2/scheduler/structs" ) const ( diff --git a/nomad/worker_test.go b/nomad/worker_test.go index b825638eadc..c9ffeaaaa2b 100644 --- a/nomad/worker_test.go +++ b/nomad/worker_test.go @@ -14,15 +14,15 @@ import ( log "github.com/hashicorp/go-hclog" "github.com/hashicorp/go-memdb" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/helper" - "github.com/hashicorp/nomad/helper/testlog" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/scheduler" - sstructs "github.com/hashicorp/nomad/scheduler/structs" - "github.com/hashicorp/nomad/testutil" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/helper" + "github.com/hashicorp/nomad/v2/helper/testlog" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/scheduler" + sstructs "github.com/hashicorp/nomad/v2/scheduler/structs" + "github.com/hashicorp/nomad/v2/testutil" "github.com/shoenig/test/must" "github.com/shoenig/test/wait" "github.com/stretchr/testify/assert" diff --git a/plugins/base/base.go b/plugins/base/base.go index 8df800221c3..6f9b8caacb1 100644 --- a/plugins/base/base.go +++ b/plugins/base/base.go @@ -4,13 +4,13 @@ package base import ( - "github.com/hashicorp/nomad/client/lib/cpustats" - "github.com/hashicorp/nomad/client/lib/idset" - "github.com/hashicorp/nomad/client/lib/numalib" - "github.com/hashicorp/nomad/client/lib/numalib/hw" - "github.com/hashicorp/nomad/helper" - "github.com/hashicorp/nomad/plugins/base/proto" - "github.com/hashicorp/nomad/plugins/shared/hclspec" + "github.com/hashicorp/nomad/v2/client/lib/cpustats" + "github.com/hashicorp/nomad/v2/client/lib/idset" + "github.com/hashicorp/nomad/v2/client/lib/numalib" + "github.com/hashicorp/nomad/v2/client/lib/numalib/hw" + "github.com/hashicorp/nomad/v2/helper" + "github.com/hashicorp/nomad/v2/plugins/base/proto" + "github.com/hashicorp/nomad/v2/plugins/shared/hclspec" ) // BasePlugin is the interface that all Nomad plugins must support. diff --git a/plugins/base/base_test.go b/plugins/base/base_test.go index 559197bdc50..8890f7edae1 100644 --- a/plugins/base/base_test.go +++ b/plugins/base/base_test.go @@ -6,10 +6,10 @@ package base import ( "testing" - "github.com/hashicorp/nomad/client/lib/idset" - "github.com/hashicorp/nomad/client/lib/numalib" - "github.com/hashicorp/nomad/client/lib/numalib/hw" - "github.com/hashicorp/nomad/plugins/base/proto" + "github.com/hashicorp/nomad/v2/client/lib/idset" + "github.com/hashicorp/nomad/v2/client/lib/numalib" + "github.com/hashicorp/nomad/v2/client/lib/numalib/hw" + "github.com/hashicorp/nomad/v2/plugins/base/proto" "github.com/shoenig/test/must" ) diff --git a/plugins/base/client.go b/plugins/base/client.go index 6aeaaa6c218..540c30bb0d3 100644 --- a/plugins/base/client.go +++ b/plugins/base/client.go @@ -7,9 +7,9 @@ import ( "context" "fmt" - "github.com/hashicorp/nomad/helper/pluginutils/grpcutils" - "github.com/hashicorp/nomad/plugins/base/proto" - "github.com/hashicorp/nomad/plugins/shared/hclspec" + "github.com/hashicorp/nomad/v2/helper/pluginutils/grpcutils" + "github.com/hashicorp/nomad/v2/plugins/base/proto" + "github.com/hashicorp/nomad/v2/plugins/shared/hclspec" ) // BasePluginClient implements the client side of a remote base plugin, using diff --git a/plugins/base/plugin.go b/plugins/base/plugin.go index d1ac765843b..7adb13735b9 100644 --- a/plugins/base/plugin.go +++ b/plugins/base/plugin.go @@ -10,7 +10,7 @@ import ( "github.com/hashicorp/go-msgpack/v2/codec" plugin "github.com/hashicorp/go-plugin" - "github.com/hashicorp/nomad/plugins/base/proto" + "github.com/hashicorp/nomad/v2/plugins/base/proto" "google.golang.org/grpc" ) diff --git a/plugins/base/plugin_test.go b/plugins/base/plugin_test.go index 899a6844d02..f42dc59d821 100644 --- a/plugins/base/plugin_test.go +++ b/plugins/base/plugin_test.go @@ -8,9 +8,9 @@ import ( pb "github.com/golang/protobuf/proto" plugin "github.com/hashicorp/go-plugin" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/plugins/shared/hclspec" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/plugins/shared/hclspec" "github.com/shoenig/test/must" "github.com/zclconf/go-cty/cty" "github.com/zclconf/go-cty/cty/msgpack" diff --git a/plugins/base/proto/base.pb.go b/plugins/base/proto/base.pb.go index 1ab0c5958c2..cb75dde9ca4 100644 --- a/plugins/base/proto/base.pb.go +++ b/plugins/base/proto/base.pb.go @@ -7,7 +7,7 @@ import ( context "context" fmt "fmt" proto "github.com/golang/protobuf/proto" - hclspec "github.com/hashicorp/nomad/plugins/shared/hclspec" + hclspec "github.com/hashicorp/nomad/v2/plugins/shared/hclspec" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" diff --git a/plugins/base/server.go b/plugins/base/server.go index 7a0f2c881d8..9871afcf561 100644 --- a/plugins/base/server.go +++ b/plugins/base/server.go @@ -8,7 +8,7 @@ import ( "fmt" plugin "github.com/hashicorp/go-plugin" - "github.com/hashicorp/nomad/plugins/base/proto" + "github.com/hashicorp/nomad/v2/plugins/base/proto" ) // basePluginServer wraps a base plugin and exposes it via gRPC. diff --git a/plugins/base/testing.go b/plugins/base/testing.go index 61a17af91bd..d5b706b7976 100644 --- a/plugins/base/testing.go +++ b/plugins/base/testing.go @@ -4,7 +4,7 @@ package base import ( - "github.com/hashicorp/nomad/plugins/shared/hclspec" + "github.com/hashicorp/nomad/v2/plugins/shared/hclspec" ) var ( diff --git a/plugins/csi/client.go b/plugins/csi/client.go index cb89a6ac8e4..269f948e1b8 100644 --- a/plugins/csi/client.go +++ b/plugins/csi/client.go @@ -19,10 +19,10 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - "github.com/hashicorp/nomad/helper/grpc-middleware/logging" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/plugins/base" - "github.com/hashicorp/nomad/plugins/shared/hclspec" + "github.com/hashicorp/nomad/v2/helper/grpc-middleware/logging" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/plugins/base" + "github.com/hashicorp/nomad/v2/plugins/shared/hclspec" ) // PluginTypeCSI implements the CSI plugin interface diff --git a/plugins/csi/client_test.go b/plugins/csi/client_test.go index 1493391b534..8de0a13a9cb 100644 --- a/plugins/csi/client_test.go +++ b/plugins/csi/client_test.go @@ -19,9 +19,9 @@ import ( "google.golang.org/grpc/status" "google.golang.org/protobuf/types/known/timestamppb" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/nomad/structs" - fake "github.com/hashicorp/nomad/plugins/csi/testing" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/nomad/structs" + fake "github.com/hashicorp/nomad/v2/plugins/csi/testing" ) func newTestClient(t *testing.T) (*fake.IdentityClient, *fake.ControllerClient, *fake.NodeClient, CSIPlugin) { diff --git a/plugins/csi/fake/client.go b/plugins/csi/fake/client.go index 3c609ae22bf..b0949a50375 100644 --- a/plugins/csi/fake/client.go +++ b/plugins/csi/fake/client.go @@ -13,9 +13,9 @@ import ( "google.golang.org/grpc" - "github.com/hashicorp/nomad/plugins/base" - "github.com/hashicorp/nomad/plugins/csi" - "github.com/hashicorp/nomad/plugins/shared/hclspec" + "github.com/hashicorp/nomad/v2/plugins/base" + "github.com/hashicorp/nomad/v2/plugins/csi" + "github.com/hashicorp/nomad/v2/plugins/shared/hclspec" ) var _ csi.CSIPlugin = &Client{} diff --git a/plugins/csi/plugin.go b/plugins/csi/plugin.go index 68a64ab4f1c..181c5e16e6d 100644 --- a/plugins/csi/plugin.go +++ b/plugins/csi/plugin.go @@ -11,8 +11,8 @@ import ( csipbv1 "github.com/container-storage-interface/spec/lib/go/csi" "google.golang.org/grpc" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/plugins/base" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/plugins/base" ) // CSIPlugin implements a lightweight abstraction layer around a CSI Plugin. diff --git a/plugins/device/client.go b/plugins/device/client.go index 44bf81e8eb5..229a19c4161 100644 --- a/plugins/device/client.go +++ b/plugins/device/client.go @@ -10,9 +10,9 @@ import ( "github.com/LK4D4/joincontext" "github.com/golang/protobuf/ptypes" - "github.com/hashicorp/nomad/helper/pluginutils/grpcutils" - "github.com/hashicorp/nomad/plugins/base" - "github.com/hashicorp/nomad/plugins/device/proto" + "github.com/hashicorp/nomad/v2/helper/pluginutils/grpcutils" + "github.com/hashicorp/nomad/v2/plugins/base" + "github.com/hashicorp/nomad/v2/plugins/device/proto" ) // devicePluginClient implements the client side of a remote device plugin, using diff --git a/plugins/device/cmd/example/cmd/main.go b/plugins/device/cmd/example/cmd/main.go index 15f9c496c5d..362d528f1b9 100644 --- a/plugins/device/cmd/example/cmd/main.go +++ b/plugins/device/cmd/example/cmd/main.go @@ -6,8 +6,8 @@ package main import ( log "github.com/hashicorp/go-hclog" - "github.com/hashicorp/nomad/plugins" - "github.com/hashicorp/nomad/plugins/device/cmd/example" + "github.com/hashicorp/nomad/v2/plugins" + "github.com/hashicorp/nomad/v2/plugins/device/cmd/example" ) func main() { diff --git a/plugins/device/cmd/example/device.go b/plugins/device/cmd/example/device.go index 60d1d43ca06..90b299edac5 100644 --- a/plugins/device/cmd/example/device.go +++ b/plugins/device/cmd/example/device.go @@ -13,10 +13,10 @@ import ( "time" log "github.com/hashicorp/go-hclog" - "github.com/hashicorp/nomad/plugins/base" - "github.com/hashicorp/nomad/plugins/device" - "github.com/hashicorp/nomad/plugins/shared/hclspec" - "github.com/hashicorp/nomad/plugins/shared/structs" + "github.com/hashicorp/nomad/v2/plugins/base" + "github.com/hashicorp/nomad/v2/plugins/device" + "github.com/hashicorp/nomad/v2/plugins/shared/hclspec" + "github.com/hashicorp/nomad/v2/plugins/shared/structs" "github.com/kr/pretty" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" diff --git a/plugins/device/device.go b/plugins/device/device.go index cf1df4bfd4a..7fb3f9d92b9 100644 --- a/plugins/device/device.go +++ b/plugins/device/device.go @@ -9,8 +9,8 @@ import ( "time" multierror "github.com/hashicorp/go-multierror" - "github.com/hashicorp/nomad/plugins/base" - "github.com/hashicorp/nomad/plugins/shared/structs" + "github.com/hashicorp/nomad/v2/plugins/base" + "github.com/hashicorp/nomad/v2/plugins/shared/structs" ) const ( diff --git a/plugins/device/mock.go b/plugins/device/mock.go index 68c0f5c28d8..96d7489e441 100644 --- a/plugins/device/mock.go +++ b/plugins/device/mock.go @@ -7,7 +7,7 @@ import ( "context" "time" - "github.com/hashicorp/nomad/plugins/base" + "github.com/hashicorp/nomad/v2/plugins/base" ) type FingerprintFn func(context.Context) (<-chan *FingerprintResponse, error) diff --git a/plugins/device/plugin.go b/plugins/device/plugin.go index 2ed1f97b32c..2591b54d31b 100644 --- a/plugins/device/plugin.go +++ b/plugins/device/plugin.go @@ -8,9 +8,9 @@ import ( log "github.com/hashicorp/go-hclog" plugin "github.com/hashicorp/go-plugin" - "github.com/hashicorp/nomad/plugins/base" - bproto "github.com/hashicorp/nomad/plugins/base/proto" - "github.com/hashicorp/nomad/plugins/device/proto" + "github.com/hashicorp/nomad/v2/plugins/base" + bproto "github.com/hashicorp/nomad/v2/plugins/base/proto" + "github.com/hashicorp/nomad/v2/plugins/device/proto" "google.golang.org/grpc" ) diff --git a/plugins/device/plugin_test.go b/plugins/device/plugin_test.go index c22ae779b19..ff82a376be2 100644 --- a/plugins/device/plugin_test.go +++ b/plugins/device/plugin_test.go @@ -11,12 +11,12 @@ import ( pb "github.com/golang/protobuf/proto" plugin "github.com/hashicorp/go-plugin" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/plugins/base" - "github.com/hashicorp/nomad/plugins/shared/hclspec" - psstructs "github.com/hashicorp/nomad/plugins/shared/structs" - "github.com/hashicorp/nomad/testutil" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/plugins/base" + "github.com/hashicorp/nomad/v2/plugins/shared/hclspec" + psstructs "github.com/hashicorp/nomad/v2/plugins/shared/structs" + "github.com/hashicorp/nomad/v2/testutil" "github.com/stretchr/testify/require" "github.com/zclconf/go-cty/cty" "github.com/zclconf/go-cty/cty/msgpack" diff --git a/plugins/device/proto/device.pb.go b/plugins/device/proto/device.pb.go index 815268efc44..a2986f4dc4b 100644 --- a/plugins/device/proto/device.pb.go +++ b/plugins/device/proto/device.pb.go @@ -9,7 +9,7 @@ import ( proto "github.com/golang/protobuf/proto" duration "github.com/golang/protobuf/ptypes/duration" timestamp "github.com/golang/protobuf/ptypes/timestamp" - proto1 "github.com/hashicorp/nomad/plugins/shared/structs/proto" + proto1 "github.com/hashicorp/nomad/v2/plugins/shared/structs/proto" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" diff --git a/plugins/device/server.go b/plugins/device/server.go index 36e6a88f454..9a68071b719 100644 --- a/plugins/device/server.go +++ b/plugins/device/server.go @@ -11,7 +11,7 @@ import ( "github.com/golang/protobuf/ptypes" "github.com/hashicorp/go-plugin" - "github.com/hashicorp/nomad/plugins/device/proto" + "github.com/hashicorp/nomad/v2/plugins/device/proto" ) // devicePluginServer wraps a device plugin and exposes it via gRPC. diff --git a/plugins/device/util.go b/plugins/device/util.go index 24e99516e0c..3813ee4c1fc 100644 --- a/plugins/device/util.go +++ b/plugins/device/util.go @@ -5,8 +5,8 @@ package device import ( "github.com/golang/protobuf/ptypes" - "github.com/hashicorp/nomad/plugins/device/proto" - "github.com/hashicorp/nomad/plugins/shared/structs" + "github.com/hashicorp/nomad/v2/plugins/device/proto" + "github.com/hashicorp/nomad/v2/plugins/shared/structs" ) // convertProtoDeviceGroups converts between a list of proto and structs DeviceGroup diff --git a/plugins/drivers/client.go b/plugins/drivers/client.go index 93c7503fda4..1085e578db7 100644 --- a/plugins/drivers/client.go +++ b/plugins/drivers/client.go @@ -12,15 +12,15 @@ import ( "github.com/LK4D4/joincontext" "github.com/golang/protobuf/ptypes" hclog "github.com/hashicorp/go-hclog" - cstructs "github.com/hashicorp/nomad/client/structs" - "github.com/hashicorp/nomad/helper/pluginutils/grpcutils" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/plugins/base" - "github.com/hashicorp/nomad/plugins/drivers/fsisolation" - "github.com/hashicorp/nomad/plugins/drivers/proto" - "github.com/hashicorp/nomad/plugins/shared/hclspec" - pstructs "github.com/hashicorp/nomad/plugins/shared/structs" - sproto "github.com/hashicorp/nomad/plugins/shared/structs/proto" + cstructs "github.com/hashicorp/nomad/v2/client/structs" + "github.com/hashicorp/nomad/v2/helper/pluginutils/grpcutils" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/plugins/base" + "github.com/hashicorp/nomad/v2/plugins/drivers/fsisolation" + "github.com/hashicorp/nomad/v2/plugins/drivers/proto" + "github.com/hashicorp/nomad/v2/plugins/shared/hclspec" + pstructs "github.com/hashicorp/nomad/v2/plugins/shared/structs" + sproto "github.com/hashicorp/nomad/v2/plugins/shared/structs/proto" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/plugins/drivers/cstructs.go b/plugins/drivers/cstructs.go index f9cb3cc360c..c8c414a7891 100644 --- a/plugins/drivers/cstructs.go +++ b/plugins/drivers/cstructs.go @@ -4,7 +4,7 @@ package drivers import ( - cstructs "github.com/hashicorp/nomad/client/structs" + cstructs "github.com/hashicorp/nomad/v2/client/structs" ) // This files present an indirection layer to client structs used by drivers, diff --git a/plugins/drivers/driver.go b/plugins/drivers/driver.go index 5e3b7074c0f..766ddadde8f 100644 --- a/plugins/drivers/driver.go +++ b/plugins/drivers/driver.go @@ -14,14 +14,14 @@ import ( "strconv" "time" - "github.com/hashicorp/nomad/client/allocdir" - cstructs "github.com/hashicorp/nomad/client/structs" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/plugins/base" - "github.com/hashicorp/nomad/plugins/drivers/fsisolation" - "github.com/hashicorp/nomad/plugins/drivers/proto" - "github.com/hashicorp/nomad/plugins/shared/hclspec" - pstructs "github.com/hashicorp/nomad/plugins/shared/structs" + "github.com/hashicorp/nomad/v2/client/allocdir" + cstructs "github.com/hashicorp/nomad/v2/client/structs" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/plugins/base" + "github.com/hashicorp/nomad/v2/plugins/drivers/fsisolation" + "github.com/hashicorp/nomad/v2/plugins/drivers/proto" + "github.com/hashicorp/nomad/v2/plugins/shared/hclspec" + pstructs "github.com/hashicorp/nomad/v2/plugins/shared/structs" "github.com/zclconf/go-cty/cty" "github.com/zclconf/go-cty/cty/msgpack" ) diff --git a/plugins/drivers/execstreaming.go b/plugins/drivers/execstreaming.go index 76e1f642498..7349fd0e521 100644 --- a/plugins/drivers/execstreaming.go +++ b/plugins/drivers/execstreaming.go @@ -9,7 +9,7 @@ import ( "io" "sync" - "github.com/hashicorp/nomad/plugins/drivers/proto" + "github.com/hashicorp/nomad/v2/plugins/drivers/proto" ) // StreamToExecOptions is a convenience method to convert exec stream into diff --git a/plugins/drivers/mock.go b/plugins/drivers/mock.go index cc6158f6030..090f4e78714 100644 --- a/plugins/drivers/mock.go +++ b/plugins/drivers/mock.go @@ -7,8 +7,8 @@ import ( "context" "time" - "github.com/hashicorp/nomad/plugins/base" - "github.com/hashicorp/nomad/plugins/shared/hclspec" + "github.com/hashicorp/nomad/v2/plugins/base" + "github.com/hashicorp/nomad/v2/plugins/shared/hclspec" ) type TaskConfigSchemaFn func() (*hclspec.Spec, error) diff --git a/plugins/drivers/plugin.go b/plugins/drivers/plugin.go index a760235c6fc..ffb064d58d3 100644 --- a/plugins/drivers/plugin.go +++ b/plugins/drivers/plugin.go @@ -8,9 +8,9 @@ import ( hclog "github.com/hashicorp/go-hclog" plugin "github.com/hashicorp/go-plugin" - "github.com/hashicorp/nomad/plugins/base" - baseproto "github.com/hashicorp/nomad/plugins/base/proto" - "github.com/hashicorp/nomad/plugins/drivers/proto" + "github.com/hashicorp/nomad/v2/plugins/base" + baseproto "github.com/hashicorp/nomad/v2/plugins/base/proto" + "github.com/hashicorp/nomad/v2/plugins/drivers/proto" "google.golang.org/grpc" ) diff --git a/plugins/drivers/plugin_test.go b/plugins/drivers/plugin_test.go index f0c6fce0e28..843f232745c 100644 --- a/plugins/drivers/plugin_test.go +++ b/plugins/drivers/plugin_test.go @@ -12,11 +12,11 @@ import ( pb "github.com/golang/protobuf/proto" "github.com/hashicorp/go-hclog" plugin "github.com/hashicorp/go-plugin" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/helper/testlog" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/plugins/base" - "github.com/hashicorp/nomad/plugins/shared/hclspec" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/helper/testlog" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/plugins/base" + "github.com/hashicorp/nomad/v2/plugins/shared/hclspec" "github.com/zclconf/go-cty/cty" "github.com/zclconf/go-cty/cty/msgpack" "google.golang.org/grpc/codes" diff --git a/plugins/drivers/proto/driver.pb.go b/plugins/drivers/proto/driver.pb.go index 975885ffda4..dd31e5a0509 100644 --- a/plugins/drivers/proto/driver.pb.go +++ b/plugins/drivers/proto/driver.pb.go @@ -9,8 +9,8 @@ import ( proto "github.com/golang/protobuf/proto" duration "github.com/golang/protobuf/ptypes/duration" timestamp "github.com/golang/protobuf/ptypes/timestamp" - hclspec "github.com/hashicorp/nomad/plugins/shared/hclspec" - proto1 "github.com/hashicorp/nomad/plugins/shared/structs/proto" + hclspec "github.com/hashicorp/nomad/v2/plugins/shared/hclspec" + proto1 "github.com/hashicorp/nomad/v2/plugins/shared/structs/proto" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" diff --git a/plugins/drivers/server.go b/plugins/drivers/server.go index 477ff44eba8..07724da3cc4 100644 --- a/plugins/drivers/server.go +++ b/plugins/drivers/server.go @@ -14,11 +14,11 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/plugins/drivers/fsisolation" - "github.com/hashicorp/nomad/plugins/drivers/proto" - dstructs "github.com/hashicorp/nomad/plugins/shared/structs" - sproto "github.com/hashicorp/nomad/plugins/shared/structs/proto" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/plugins/drivers/fsisolation" + "github.com/hashicorp/nomad/v2/plugins/drivers/proto" + dstructs "github.com/hashicorp/nomad/v2/plugins/shared/structs" + sproto "github.com/hashicorp/nomad/v2/plugins/shared/structs/proto" ) type driverPluginServer struct { diff --git a/plugins/drivers/task_handle.go b/plugins/drivers/task_handle.go index 13e26e9bce4..5ca3b6023ff 100644 --- a/plugins/drivers/task_handle.go +++ b/plugins/drivers/task_handle.go @@ -4,7 +4,7 @@ package drivers import ( - "github.com/hashicorp/nomad/plugins/base" + "github.com/hashicorp/nomad/v2/plugins/base" ) // TaskHandle is the state shared between a driver and the client. diff --git a/plugins/drivers/testutils/dns_testing.go b/plugins/drivers/testutils/dns_testing.go index 04c06b9ca0a..052e2824974 100644 --- a/plugins/drivers/testutils/dns_testing.go +++ b/plugins/drivers/testutils/dns_testing.go @@ -7,9 +7,9 @@ import ( "strings" "testing" - "github.com/hashicorp/nomad/lib/resolvconf" - "github.com/hashicorp/nomad/plugins/drivers" - "github.com/hashicorp/nomad/plugins/drivers/fsisolation" + "github.com/hashicorp/nomad/v2/lib/resolvconf" + "github.com/hashicorp/nomad/v2/plugins/drivers" + "github.com/hashicorp/nomad/v2/plugins/drivers/fsisolation" "github.com/shoenig/test/must" ) diff --git a/plugins/drivers/testutils/exec_testing.go b/plugins/drivers/testutils/exec_testing.go index 374c07d6ca6..83ca84bc419 100644 --- a/plugins/drivers/testutils/exec_testing.go +++ b/plugins/drivers/testutils/exec_testing.go @@ -15,11 +15,11 @@ import ( "testing" "time" - "github.com/hashicorp/nomad/client/lib/cgroupslib" - "github.com/hashicorp/nomad/plugins/drivers" - "github.com/hashicorp/nomad/plugins/drivers/fsisolation" - dproto "github.com/hashicorp/nomad/plugins/drivers/proto" - "github.com/hashicorp/nomad/testutil" + "github.com/hashicorp/nomad/v2/client/lib/cgroupslib" + "github.com/hashicorp/nomad/v2/plugins/drivers" + "github.com/hashicorp/nomad/v2/plugins/drivers/fsisolation" + dproto "github.com/hashicorp/nomad/v2/plugins/drivers/proto" + "github.com/hashicorp/nomad/v2/testutil" "github.com/shoenig/test/must" ) diff --git a/plugins/drivers/testutils/testing.go b/plugins/drivers/testutils/testing.go index c46a9fbcfb3..0a494002d2b 100644 --- a/plugins/drivers/testutils/testing.go +++ b/plugins/drivers/testutils/testing.go @@ -14,18 +14,18 @@ import ( hclog "github.com/hashicorp/go-hclog" plugin "github.com/hashicorp/go-plugin" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/client/allocdir" - "github.com/hashicorp/nomad/client/logmon" - "github.com/hashicorp/nomad/client/taskenv" - "github.com/hashicorp/nomad/helper/testlog" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/plugins/base" - "github.com/hashicorp/nomad/plugins/drivers" - "github.com/hashicorp/nomad/plugins/drivers/fsisolation" - "github.com/hashicorp/nomad/plugins/shared/hclspec" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/client/allocdir" + "github.com/hashicorp/nomad/v2/client/logmon" + "github.com/hashicorp/nomad/v2/client/taskenv" + "github.com/hashicorp/nomad/v2/helper/testlog" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/plugins/base" + "github.com/hashicorp/nomad/v2/plugins/drivers" + "github.com/hashicorp/nomad/v2/plugins/drivers/fsisolation" + "github.com/hashicorp/nomad/v2/plugins/shared/hclspec" "github.com/shoenig/test/must" ) diff --git a/plugins/drivers/testutils/testing_linux.go b/plugins/drivers/testutils/testing_linux.go index f8aad85efdb..8ab0b60b742 100644 --- a/plugins/drivers/testutils/testing_linux.go +++ b/plugins/drivers/testutils/testing_linux.go @@ -6,7 +6,7 @@ package testutils import ( - "github.com/hashicorp/nomad/client/lib/cgroupslib" + "github.com/hashicorp/nomad/v2/client/lib/cgroupslib" "github.com/shoenig/test/must" ) diff --git a/plugins/drivers/testutils/testing_test.go b/plugins/drivers/testutils/testing_test.go index f94649d4350..035055c3047 100644 --- a/plugins/drivers/testutils/testing_test.go +++ b/plugins/drivers/testutils/testing_test.go @@ -12,10 +12,10 @@ import ( "time" "github.com/hashicorp/go-msgpack/v2/codec" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/plugins/drivers" - pstructs "github.com/hashicorp/nomad/plugins/shared/structs" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/plugins/drivers" + pstructs "github.com/hashicorp/nomad/v2/plugins/shared/structs" "github.com/shoenig/test/must" ) diff --git a/plugins/drivers/utils.go b/plugins/drivers/utils.go index 19a2d79a1a1..4cec7e2096e 100644 --- a/plugins/drivers/utils.go +++ b/plugins/drivers/utils.go @@ -7,8 +7,8 @@ import ( "time" "github.com/golang/protobuf/ptypes" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/plugins/drivers/proto" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/plugins/drivers/proto" ) var taskStateToProtoMap = map[TaskState]proto.TaskState{ diff --git a/plugins/drivers/utils_test.go b/plugins/drivers/utils_test.go index 0fa78c097e8..4ca36d3543a 100644 --- a/plugins/drivers/utils_test.go +++ b/plugins/drivers/utils_test.go @@ -6,9 +6,9 @@ package drivers import ( "testing" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/plugins/drivers/proto" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/plugins/drivers/proto" "github.com/shoenig/test/must" ) diff --git a/plugins/serve.go b/plugins/serve.go index c1b2cdc16d7..7ccdbaa8f3f 100644 --- a/plugins/serve.go +++ b/plugins/serve.go @@ -8,8 +8,8 @@ import ( "fmt" log "github.com/hashicorp/go-hclog" - "github.com/hashicorp/nomad/plugins/device" - "github.com/hashicorp/nomad/plugins/drivers" + "github.com/hashicorp/nomad/v2/plugins/device" + "github.com/hashicorp/nomad/v2/plugins/drivers" ) // PluginFactory returns a new plugin instance diff --git a/plugins/shared/cmd/launcher/command/device.go b/plugins/shared/cmd/launcher/command/device.go index 6b709a3bae7..ad7c6f74626 100644 --- a/plugins/shared/cmd/launcher/command/device.go +++ b/plugins/shared/cmd/launcher/command/device.go @@ -19,10 +19,10 @@ import ( "github.com/hashicorp/hcl" "github.com/hashicorp/hcl/hcl/ast" "github.com/hashicorp/hcl/v2/hcldec" - "github.com/hashicorp/nomad/helper/pluginutils/hclspecutils" - "github.com/hashicorp/nomad/helper/pluginutils/hclutils" - "github.com/hashicorp/nomad/plugins/base" - "github.com/hashicorp/nomad/plugins/device" + "github.com/hashicorp/nomad/v2/helper/pluginutils/hclspecutils" + "github.com/hashicorp/nomad/v2/helper/pluginutils/hclutils" + "github.com/hashicorp/nomad/v2/plugins/base" + "github.com/hashicorp/nomad/v2/plugins/device" "github.com/kr/pretty" "github.com/zclconf/go-cty/cty/msgpack" ) diff --git a/plugins/shared/cmd/launcher/main.go b/plugins/shared/cmd/launcher/main.go index 27b2f25822a..d32a8f18e0d 100644 --- a/plugins/shared/cmd/launcher/main.go +++ b/plugins/shared/cmd/launcher/main.go @@ -8,7 +8,7 @@ import ( "github.com/hashicorp/cli" hclog "github.com/hashicorp/go-hclog" - "github.com/hashicorp/nomad/plugins/shared/cmd/launcher/command" + "github.com/hashicorp/nomad/v2/plugins/shared/cmd/launcher/command" ) const ( diff --git a/plugins/shared/structs/util.go b/plugins/shared/structs/util.go index 2bcafa3f0da..b28804b3be4 100644 --- a/plugins/shared/structs/util.go +++ b/plugins/shared/structs/util.go @@ -5,7 +5,7 @@ package structs import ( "github.com/golang/protobuf/ptypes/wrappers" - "github.com/hashicorp/nomad/plugins/shared/structs/proto" + "github.com/hashicorp/nomad/v2/plugins/shared/structs/proto" ) func ConvertProtoAttribute(in *proto.Attribute) *Attribute { diff --git a/scheduler/annotate.go b/scheduler/annotate.go index 12ee0a35233..ad58ca43125 100644 --- a/scheduler/annotate.go +++ b/scheduler/annotate.go @@ -6,7 +6,7 @@ package scheduler import ( "strconv" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/nomad/structs" ) const ( diff --git a/scheduler/annotate_test.go b/scheduler/annotate_test.go index 5868fd4d954..bd96cebe344 100644 --- a/scheduler/annotate_test.go +++ b/scheduler/annotate_test.go @@ -6,8 +6,8 @@ package scheduler import ( "testing" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/nomad/structs" "github.com/shoenig/test/must" ) diff --git a/scheduler/benchmarks/benchmarks_test.go b/scheduler/benchmarks/benchmarks_test.go index 8d44ef866d9..70d9acd2a7b 100644 --- a/scheduler/benchmarks/benchmarks_test.go +++ b/scheduler/benchmarks/benchmarks_test.go @@ -10,11 +10,11 @@ import ( "github.com/shoenig/test/must" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/scheduler" - "github.com/hashicorp/nomad/scheduler/tests" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/scheduler" + "github.com/hashicorp/nomad/v2/scheduler/tests" ) // BenchmarkSchedulerExample is an example of how to write a one-off diff --git a/scheduler/benchmarks/helpers_test.go b/scheduler/benchmarks/helpers_test.go index 8d1d28e922b..403e53f618e 100644 --- a/scheduler/benchmarks/helpers_test.go +++ b/scheduler/benchmarks/helpers_test.go @@ -14,8 +14,8 @@ import ( "os" "testing" - "github.com/hashicorp/nomad/helper/raftutil" - "github.com/hashicorp/nomad/scheduler/tests" + "github.com/hashicorp/nomad/v2/helper/raftutil" + "github.com/hashicorp/nomad/v2/scheduler/tests" "github.com/shoenig/test/must" ) diff --git a/scheduler/feasible/context.go b/scheduler/feasible/context.go index 62d602c2379..0c36700361e 100644 --- a/scheduler/feasible/context.go +++ b/scheduler/feasible/context.go @@ -9,11 +9,11 @@ import ( log "github.com/hashicorp/go-hclog" memdb "github.com/hashicorp/go-memdb" - "github.com/hashicorp/nomad/helper/testlog" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/nomad/state" - "github.com/hashicorp/nomad/nomad/structs" - sstructs "github.com/hashicorp/nomad/scheduler/structs" + "github.com/hashicorp/nomad/v2/helper/testlog" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/nomad/state" + "github.com/hashicorp/nomad/v2/nomad/structs" + sstructs "github.com/hashicorp/nomad/v2/scheduler/structs" ) // Context is used to track contextual information used for placement diff --git a/scheduler/feasible/context_test.go b/scheduler/feasible/context_test.go index bac51c1e656..352a2a632ee 100644 --- a/scheduler/feasible/context_test.go +++ b/scheduler/feasible/context_test.go @@ -6,12 +6,12 @@ package feasible import ( "testing" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" - sstructs "github.com/hashicorp/nomad/scheduler/structs" - "github.com/hashicorp/nomad/scheduler/tests" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" + sstructs "github.com/hashicorp/nomad/v2/scheduler/structs" + "github.com/hashicorp/nomad/v2/scheduler/tests" "github.com/shoenig/test/must" ) diff --git a/scheduler/feasible/device.go b/scheduler/feasible/device.go index 66f083f7c92..dbc6c3ed403 100644 --- a/scheduler/feasible/device.go +++ b/scheduler/feasible/device.go @@ -10,9 +10,9 @@ import ( "math" "github.com/hashicorp/go-set/v3" - "github.com/hashicorp/nomad/client/lib/numalib" - "github.com/hashicorp/nomad/nomad/structs" - psstructs "github.com/hashicorp/nomad/plugins/shared/structs" + "github.com/hashicorp/nomad/v2/client/lib/numalib" + "github.com/hashicorp/nomad/v2/nomad/structs" + psstructs "github.com/hashicorp/nomad/v2/plugins/shared/structs" ) // deviceAllocator is used to allocate devices to allocations. The allocator diff --git a/scheduler/feasible/device_test.go b/scheduler/feasible/device_test.go index 14f52cfb13d..5a926a682e4 100644 --- a/scheduler/feasible/device_test.go +++ b/scheduler/feasible/device_test.go @@ -7,13 +7,13 @@ import ( "testing" "github.com/hashicorp/go-set/v3" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/client/lib/numalib" - "github.com/hashicorp/nomad/client/lib/numalib/hw" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" - psstructs "github.com/hashicorp/nomad/plugins/shared/structs" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/client/lib/numalib" + "github.com/hashicorp/nomad/v2/client/lib/numalib/hw" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" + psstructs "github.com/hashicorp/nomad/v2/plugins/shared/structs" "github.com/shoenig/test/must" ) diff --git a/scheduler/feasible/feasible.go b/scheduler/feasible/feasible.go index 91f4cfcd5da..052bded785f 100644 --- a/scheduler/feasible/feasible.go +++ b/scheduler/feasible/feasible.go @@ -16,10 +16,10 @@ import ( "github.com/hashicorp/go-memdb" "github.com/hashicorp/go-version" - "github.com/hashicorp/nomad/helper/constraints/semver" - "github.com/hashicorp/nomad/nomad/state" - "github.com/hashicorp/nomad/nomad/structs" - psstructs "github.com/hashicorp/nomad/plugins/shared/structs" + "github.com/hashicorp/nomad/v2/helper/constraints/semver" + "github.com/hashicorp/nomad/v2/nomad/state" + "github.com/hashicorp/nomad/v2/nomad/structs" + psstructs "github.com/hashicorp/nomad/v2/plugins/shared/structs" ) const ( diff --git a/scheduler/feasible/feasible_test.go b/scheduler/feasible/feasible_test.go index 1db3b2631b2..814585e9aaa 100644 --- a/scheduler/feasible/feasible_test.go +++ b/scheduler/feasible/feasible_test.go @@ -8,14 +8,14 @@ import ( "testing" "time" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/helper" - "github.com/hashicorp/nomad/helper/testlog" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/state" - "github.com/hashicorp/nomad/nomad/structs" - psstructs "github.com/hashicorp/nomad/plugins/shared/structs" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/helper" + "github.com/hashicorp/nomad/v2/helper/testlog" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/state" + "github.com/hashicorp/nomad/v2/nomad/structs" + psstructs "github.com/hashicorp/nomad/v2/plugins/shared/structs" "github.com/shoenig/test" "github.com/shoenig/test/must" ) diff --git a/scheduler/feasible/numa_ce.go b/scheduler/feasible/numa_ce.go index e3fccd28f14..265b985478a 100644 --- a/scheduler/feasible/numa_ce.go +++ b/scheduler/feasible/numa_ce.go @@ -10,10 +10,10 @@ import ( "math/rand" "slices" - "github.com/hashicorp/nomad/client/lib/idset" - "github.com/hashicorp/nomad/client/lib/numalib" - "github.com/hashicorp/nomad/client/lib/numalib/hw" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/client/lib/idset" + "github.com/hashicorp/nomad/v2/client/lib/numalib" + "github.com/hashicorp/nomad/v2/client/lib/numalib/hw" + "github.com/hashicorp/nomad/v2/nomad/structs" ) type coreSelector struct { diff --git a/scheduler/feasible/numa_ce_test.go b/scheduler/feasible/numa_ce_test.go index 135a8854d34..dac1b6737c1 100644 --- a/scheduler/feasible/numa_ce_test.go +++ b/scheduler/feasible/numa_ce_test.go @@ -6,10 +6,10 @@ package feasible import ( "testing" - "github.com/hashicorp/nomad/client/lib/idset" - "github.com/hashicorp/nomad/client/lib/numalib" - "github.com/hashicorp/nomad/client/lib/numalib/hw" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/client/lib/idset" + "github.com/hashicorp/nomad/v2/client/lib/numalib" + "github.com/hashicorp/nomad/v2/client/lib/numalib/hw" + "github.com/hashicorp/nomad/v2/nomad/structs" "github.com/shoenig/test/must" ) diff --git a/scheduler/feasible/preemption.go b/scheduler/feasible/preemption.go index 696847323a8..41154b0326d 100644 --- a/scheduler/feasible/preemption.go +++ b/scheduler/feasible/preemption.go @@ -8,8 +8,8 @@ import ( "math" "sort" - "github.com/hashicorp/nomad/helper" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/helper" + "github.com/hashicorp/nomad/v2/nomad/structs" ) // maxParallelPenalty is a score penalty applied to allocations to mitigate against diff --git a/scheduler/feasible/preemption_test.go b/scheduler/feasible/preemption_test.go index 44f1c36e080..ca74b0bb3d7 100644 --- a/scheduler/feasible/preemption_test.go +++ b/scheduler/feasible/preemption_test.go @@ -8,12 +8,12 @@ import ( "strconv" "testing" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" - psstructs "github.com/hashicorp/nomad/plugins/shared/structs" - "github.com/hashicorp/nomad/scheduler/tests" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" + psstructs "github.com/hashicorp/nomad/v2/plugins/shared/structs" + "github.com/hashicorp/nomad/v2/scheduler/tests" "github.com/shoenig/test/must" ) diff --git a/scheduler/feasible/propertyset.go b/scheduler/feasible/propertyset.go index 7525509cef2..040702a1456 100644 --- a/scheduler/feasible/propertyset.go +++ b/scheduler/feasible/propertyset.go @@ -10,7 +10,7 @@ import ( log "github.com/hashicorp/go-hclog" memdb "github.com/hashicorp/go-memdb" "github.com/hashicorp/go-set/v3" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/nomad/structs" ) // propertySet is used to track the values used for a particular property. diff --git a/scheduler/feasible/rank.go b/scheduler/feasible/rank.go index 294ad58ca82..441aa4132d4 100644 --- a/scheduler/feasible/rank.go +++ b/scheduler/feasible/rank.go @@ -9,12 +9,12 @@ import ( "slices" "github.com/hashicorp/go-set/v3" - "github.com/hashicorp/nomad/client/lib/idset" - "github.com/hashicorp/nomad/client/lib/numalib/hw" - "github.com/hashicorp/nomad/helper" - "github.com/hashicorp/nomad/helper/safemath" - "github.com/hashicorp/nomad/nomad/structs" - sstructs "github.com/hashicorp/nomad/scheduler/structs" + "github.com/hashicorp/nomad/v2/client/lib/idset" + "github.com/hashicorp/nomad/v2/client/lib/numalib/hw" + "github.com/hashicorp/nomad/v2/helper" + "github.com/hashicorp/nomad/v2/helper/safemath" + "github.com/hashicorp/nomad/v2/nomad/structs" + sstructs "github.com/hashicorp/nomad/v2/scheduler/structs" ) const ( diff --git a/scheduler/feasible/rank_test.go b/scheduler/feasible/rank_test.go index 42e57e5b869..09802c25fa9 100644 --- a/scheduler/feasible/rank_test.go +++ b/scheduler/feasible/rank_test.go @@ -7,14 +7,14 @@ import ( "sort" "testing" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/client/lib/idset" - "github.com/hashicorp/nomad/client/lib/numalib" - "github.com/hashicorp/nomad/client/lib/numalib/hw" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/scheduler/tests" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/client/lib/idset" + "github.com/hashicorp/nomad/v2/client/lib/numalib" + "github.com/hashicorp/nomad/v2/client/lib/numalib/hw" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/scheduler/tests" "github.com/shoenig/test" "github.com/shoenig/test/must" ) diff --git a/scheduler/feasible/select_test.go b/scheduler/feasible/select_test.go index 5c2986bd050..6e75809b0cb 100644 --- a/scheduler/feasible/select_test.go +++ b/scheduler/feasible/select_test.go @@ -6,9 +6,9 @@ package feasible import ( "testing" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" "github.com/shoenig/test/must" ) diff --git a/scheduler/feasible/spread.go b/scheduler/feasible/spread.go index ac6244232d8..6cbf0121b90 100644 --- a/scheduler/feasible/spread.go +++ b/scheduler/feasible/spread.go @@ -4,8 +4,8 @@ package feasible import ( - "github.com/hashicorp/nomad/helper" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/helper" + "github.com/hashicorp/nomad/v2/nomad/structs" ) const ( diff --git a/scheduler/feasible/spread_test.go b/scheduler/feasible/spread_test.go index cad7a396137..549fd231d5a 100644 --- a/scheduler/feasible/spread_test.go +++ b/scheduler/feasible/spread_test.go @@ -12,10 +12,10 @@ import ( "github.com/shoenig/test/must" "github.com/hashicorp/go-set/v3" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" ) func TestSpreadIterator_SingleAttribute(t *testing.T) { diff --git a/scheduler/feasible/stack.go b/scheduler/feasible/stack.go index 62e68d853eb..636e391b956 100644 --- a/scheduler/feasible/stack.go +++ b/scheduler/feasible/stack.go @@ -7,7 +7,7 @@ import ( "math" "time" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/nomad/structs" ) const ( diff --git a/scheduler/feasible/stack_test.go b/scheduler/feasible/stack_test.go index 15d7e9184d5..7e3a9d15fb0 100644 --- a/scheduler/feasible/stack_test.go +++ b/scheduler/feasible/stack_test.go @@ -8,9 +8,9 @@ import ( "runtime" "testing" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" "github.com/shoenig/test/must" ) diff --git a/scheduler/generic_sched.go b/scheduler/generic_sched.go index bdc3cdcb2b9..5ee37e8f2c9 100644 --- a/scheduler/generic_sched.go +++ b/scheduler/generic_sched.go @@ -13,12 +13,12 @@ import ( log "github.com/hashicorp/go-hclog" "github.com/hashicorp/go-memdb" "github.com/hashicorp/go-multierror" - "github.com/hashicorp/nomad/helper" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/scheduler/feasible" - "github.com/hashicorp/nomad/scheduler/reconciler" - sstructs "github.com/hashicorp/nomad/scheduler/structs" + "github.com/hashicorp/nomad/v2/helper" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/scheduler/feasible" + "github.com/hashicorp/nomad/v2/scheduler/reconciler" + sstructs "github.com/hashicorp/nomad/v2/scheduler/structs" ) const ( diff --git a/scheduler/generic_sched_test.go b/scheduler/generic_sched_test.go index 25260f1573c..cd8689c0e04 100644 --- a/scheduler/generic_sched_test.go +++ b/scheduler/generic_sched_test.go @@ -12,14 +12,14 @@ import ( "time" memdb "github.com/hashicorp/go-memdb" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/helper" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/scheduler/reconciler" - sstructs "github.com/hashicorp/nomad/scheduler/structs" - "github.com/hashicorp/nomad/scheduler/tests" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/helper" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/scheduler/reconciler" + sstructs "github.com/hashicorp/nomad/v2/scheduler/structs" + "github.com/hashicorp/nomad/v2/scheduler/tests" "github.com/shoenig/test" "github.com/shoenig/test/must" ) diff --git a/scheduler/integration/preemption_test.go b/scheduler/integration/preemption_test.go index 24fa76a08de..2d2dcc7c4c2 100644 --- a/scheduler/integration/preemption_test.go +++ b/scheduler/integration/preemption_test.go @@ -7,13 +7,13 @@ import ( "fmt" "testing" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" - psstructs "github.com/hashicorp/nomad/plugins/shared/structs" - "github.com/hashicorp/nomad/scheduler" - "github.com/hashicorp/nomad/scheduler/tests" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" + psstructs "github.com/hashicorp/nomad/v2/plugins/shared/structs" + "github.com/hashicorp/nomad/v2/scheduler" + "github.com/hashicorp/nomad/v2/scheduler/tests" "github.com/shoenig/test/must" ) diff --git a/scheduler/integration/spread_test.go b/scheduler/integration/spread_test.go index 8964a9690a0..6aaead92493 100644 --- a/scheduler/integration/spread_test.go +++ b/scheduler/integration/spread_test.go @@ -10,13 +10,13 @@ import ( "testing" "time" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/scheduler" - "github.com/hashicorp/nomad/scheduler/feasible" - "github.com/hashicorp/nomad/scheduler/tests" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/scheduler" + "github.com/hashicorp/nomad/v2/scheduler/feasible" + "github.com/hashicorp/nomad/v2/scheduler/tests" "github.com/shoenig/test" "github.com/shoenig/test/must" ) diff --git a/scheduler/reconciler/allocs.go b/scheduler/reconciler/allocs.go index a54132a751f..ec21ad0fe14 100644 --- a/scheduler/reconciler/allocs.go +++ b/scheduler/reconciler/allocs.go @@ -9,7 +9,7 @@ import ( "sort" "strings" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/nomad/structs" ) // This file contains various types and methods that are used for keeping track diff --git a/scheduler/reconciler/allocs_test.go b/scheduler/reconciler/allocs_test.go index 43a3df701cf..a5d19488a4c 100644 --- a/scheduler/reconciler/allocs_test.go +++ b/scheduler/reconciler/allocs_test.go @@ -7,10 +7,10 @@ import ( "testing" "time" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" "github.com/shoenig/test/must" ) diff --git a/scheduler/reconciler/filters.go b/scheduler/reconciler/filters.go index 0ef42afe634..fdb23a1e045 100644 --- a/scheduler/reconciler/filters.go +++ b/scheduler/reconciler/filters.go @@ -7,8 +7,8 @@ import ( "slices" "time" - "github.com/hashicorp/nomad/nomad/structs" - sstructs "github.com/hashicorp/nomad/scheduler/structs" + "github.com/hashicorp/nomad/v2/nomad/structs" + sstructs "github.com/hashicorp/nomad/v2/scheduler/structs" ) // filterAndStopAll returns a stop result including all allocations in the diff --git a/scheduler/reconciler/filters_test.go b/scheduler/reconciler/filters_test.go index c3a27429d51..c5f8573a52d 100644 --- a/scheduler/reconciler/filters_test.go +++ b/scheduler/reconciler/filters_test.go @@ -7,8 +7,8 @@ import ( "testing" "time" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" "github.com/shoenig/test/must" ) diff --git a/scheduler/reconciler/reconcile_cluster.go b/scheduler/reconciler/reconcile_cluster.go index 8cab27c9bb0..59e3e8329ba 100644 --- a/scheduler/reconciler/reconcile_cluster.go +++ b/scheduler/reconciler/reconcile_cluster.go @@ -18,9 +18,9 @@ import ( log "github.com/hashicorp/go-hclog" metrics "github.com/hashicorp/go-metrics/compat" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/nomad/structs" - sstructs "github.com/hashicorp/nomad/scheduler/structs" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/nomad/structs" + sstructs "github.com/hashicorp/nomad/v2/scheduler/structs" ) const ( diff --git a/scheduler/reconciler/reconcile_cluster_prop_test.go b/scheduler/reconciler/reconcile_cluster_prop_test.go index 0ee92ab3f65..ed4eabd5a38 100644 --- a/scheduler/reconciler/reconcile_cluster_prop_test.go +++ b/scheduler/reconciler/reconcile_cluster_prop_test.go @@ -11,9 +11,9 @@ import ( "testing" "time" - "github.com/hashicorp/nomad/helper" - "github.com/hashicorp/nomad/helper/testlog" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/helper" + "github.com/hashicorp/nomad/v2/helper/testlog" + "github.com/hashicorp/nomad/v2/nomad/structs" "github.com/shoenig/test/must" "pgregory.net/rapid" ) diff --git a/scheduler/reconciler/reconcile_cluster_test.go b/scheduler/reconciler/reconcile_cluster_test.go index 9a404e3e2a1..31fa03c0d1a 100644 --- a/scheduler/reconciler/reconcile_cluster_test.go +++ b/scheduler/reconciler/reconcile_cluster_test.go @@ -11,12 +11,12 @@ import ( "testing" "time" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/helper" - "github.com/hashicorp/nomad/helper/testlog" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/helper" + "github.com/hashicorp/nomad/v2/helper/testlog" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" "github.com/kr/pretty" "github.com/shoenig/test" "github.com/shoenig/test/must" diff --git a/scheduler/reconciler/reconcile_node.go b/scheduler/reconciler/reconcile_node.go index 45d90d63e93..45073502fec 100644 --- a/scheduler/reconciler/reconcile_node.go +++ b/scheduler/reconciler/reconcile_node.go @@ -9,8 +9,8 @@ import ( "time" "github.com/hashicorp/go-version" - "github.com/hashicorp/nomad/nomad/structs" - sstructs "github.com/hashicorp/nomad/scheduler/structs" + "github.com/hashicorp/nomad/v2/nomad/structs" + sstructs "github.com/hashicorp/nomad/v2/scheduler/structs" ) type NodeReconciler struct { diff --git a/scheduler/reconciler/reconcile_node_prop_test.go b/scheduler/reconciler/reconcile_node_prop_test.go index 85b48ec9fb5..f79e4c72a89 100644 --- a/scheduler/reconciler/reconcile_node_prop_test.go +++ b/scheduler/reconciler/reconcile_node_prop_test.go @@ -7,7 +7,7 @@ import ( "testing" "time" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/nomad/structs" "github.com/shoenig/test/must" "pgregory.net/rapid" ) diff --git a/scheduler/reconciler/reconcile_node_test.go b/scheduler/reconciler/reconcile_node_test.go index acb3586783f..d8ba1212af5 100644 --- a/scheduler/reconciler/reconcile_node_test.go +++ b/scheduler/reconciler/reconcile_node_test.go @@ -11,10 +11,10 @@ import ( "github.com/shoenig/test" "github.com/shoenig/test/must" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" ) // diffResultCount is a test helper struct that makes it easier to specify an diff --git a/scheduler/reconciler/reconnecting_picker.go b/scheduler/reconciler/reconnecting_picker.go index cf0d96c5461..95088f7c1e2 100644 --- a/scheduler/reconciler/reconnecting_picker.go +++ b/scheduler/reconciler/reconnecting_picker.go @@ -7,7 +7,7 @@ import ( "time" log "github.com/hashicorp/go-hclog" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/nomad/structs" ) type reconnectingPickerInterface interface { diff --git a/scheduler/reconciler/reconnecting_picker_test.go b/scheduler/reconciler/reconnecting_picker_test.go index 78af9a59a90..feaa12d2bee 100644 --- a/scheduler/reconciler/reconnecting_picker_test.go +++ b/scheduler/reconciler/reconnecting_picker_test.go @@ -8,7 +8,7 @@ import ( "time" "github.com/hashicorp/go-hclog" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/nomad/structs" "github.com/shoenig/test/must" ) diff --git a/scheduler/scheduler.go b/scheduler/scheduler.go index 267827829e0..23dce5ec091 100644 --- a/scheduler/scheduler.go +++ b/scheduler/scheduler.go @@ -7,7 +7,7 @@ import ( "fmt" log "github.com/hashicorp/go-hclog" - "github.com/hashicorp/nomad/scheduler/structs" + "github.com/hashicorp/nomad/v2/scheduler/structs" ) const ( diff --git a/scheduler/scheduler_sysbatch.go b/scheduler/scheduler_sysbatch.go index 1a2646e3f07..1d2df446424 100644 --- a/scheduler/scheduler_sysbatch.go +++ b/scheduler/scheduler_sysbatch.go @@ -9,11 +9,11 @@ import ( log "github.com/hashicorp/go-hclog" "github.com/hashicorp/go-memdb" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/scheduler/feasible" - "github.com/hashicorp/nomad/scheduler/reconciler" - sstructs "github.com/hashicorp/nomad/scheduler/structs" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/scheduler/feasible" + "github.com/hashicorp/nomad/v2/scheduler/reconciler" + sstructs "github.com/hashicorp/nomad/v2/scheduler/structs" ) const ( diff --git a/scheduler/scheduler_sysbatch_test.go b/scheduler/scheduler_sysbatch_test.go index eb471d45f5b..dc308f8e224 100644 --- a/scheduler/scheduler_sysbatch_test.go +++ b/scheduler/scheduler_sysbatch_test.go @@ -9,12 +9,12 @@ import ( "testing" "github.com/hashicorp/go-memdb" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/helper" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/scheduler/tests" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/helper" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/scheduler/tests" "github.com/kr/pretty" "github.com/shoenig/test/must" ) diff --git a/scheduler/scheduler_system.go b/scheduler/scheduler_system.go index b323f111bb3..61c2478c61e 100644 --- a/scheduler/scheduler_system.go +++ b/scheduler/scheduler_system.go @@ -12,11 +12,11 @@ import ( log "github.com/hashicorp/go-hclog" "github.com/hashicorp/go-memdb" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/scheduler/feasible" - "github.com/hashicorp/nomad/scheduler/reconciler" - sstructs "github.com/hashicorp/nomad/scheduler/structs" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/scheduler/feasible" + "github.com/hashicorp/nomad/v2/scheduler/reconciler" + sstructs "github.com/hashicorp/nomad/v2/scheduler/structs" ) const ( diff --git a/scheduler/scheduler_system_test.go b/scheduler/scheduler_system_test.go index bb9ac1bf46a..88a2e1e19a7 100644 --- a/scheduler/scheduler_system_test.go +++ b/scheduler/scheduler_system_test.go @@ -12,14 +12,14 @@ import ( "time" memdb "github.com/hashicorp/go-memdb" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/helper" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/scheduler/feasible" - "github.com/hashicorp/nomad/scheduler/reconciler" - "github.com/hashicorp/nomad/scheduler/tests" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/helper" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/scheduler/feasible" + "github.com/hashicorp/nomad/v2/scheduler/reconciler" + "github.com/hashicorp/nomad/v2/scheduler/tests" "github.com/shoenig/test" "github.com/shoenig/test/must" ) diff --git a/scheduler/scheduler_test.go b/scheduler/scheduler_test.go index b13f69e2189..65ca696f9a7 100644 --- a/scheduler/scheduler_test.go +++ b/scheduler/scheduler_test.go @@ -7,12 +7,12 @@ import ( "fmt" "testing" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/structs" - sstructs "github.com/hashicorp/nomad/scheduler/structs" - "github.com/hashicorp/nomad/scheduler/tests" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/structs" + sstructs "github.com/hashicorp/nomad/v2/scheduler/structs" + "github.com/hashicorp/nomad/v2/scheduler/tests" "github.com/shoenig/test/must" ) diff --git a/scheduler/structs/interfaces.go b/scheduler/structs/interfaces.go index 448a7e2d853..b799bfc2620 100644 --- a/scheduler/structs/interfaces.go +++ b/scheduler/structs/interfaces.go @@ -8,8 +8,8 @@ import ( "github.com/hashicorp/go-memdb" "github.com/hashicorp/go-version" - "github.com/hashicorp/nomad/nomad/state" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/nomad/state" + "github.com/hashicorp/nomad/v2/nomad/structs" ) /* diff --git a/scheduler/structs/structs.go b/scheduler/structs/structs.go index a1625e23d14..1323f2962aa 100644 --- a/scheduler/structs/structs.go +++ b/scheduler/structs/structs.go @@ -10,9 +10,9 @@ import ( "github.com/hashicorp/go-memdb" "github.com/hashicorp/go-version" - "github.com/hashicorp/nomad/helper" - "github.com/hashicorp/nomad/nomad/state" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/helper" + "github.com/hashicorp/nomad/v2/nomad/state" + "github.com/hashicorp/nomad/v2/nomad/structs" ) // PortCollisionEvent is an event that can happen during scheduling when diff --git a/scheduler/tests/numa_ce.go b/scheduler/tests/numa_ce.go index c204386dc6a..6ffe0f0cf92 100644 --- a/scheduler/tests/numa_ce.go +++ b/scheduler/tests/numa_ce.go @@ -4,10 +4,10 @@ package tests import ( - "github.com/hashicorp/nomad/client/lib/idset" - "github.com/hashicorp/nomad/client/lib/numalib" - "github.com/hashicorp/nomad/client/lib/numalib/hw" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/client/lib/idset" + "github.com/hashicorp/nomad/v2/client/lib/numalib" + "github.com/hashicorp/nomad/v2/client/lib/numalib/hw" + "github.com/hashicorp/nomad/v2/nomad/structs" ) // CpuResources creates both the legacy and modern structs concerning cpu diff --git a/scheduler/tests/testing.go b/scheduler/tests/testing.go index 1d2990136f4..c2bb6356edd 100644 --- a/scheduler/tests/testing.go +++ b/scheduler/tests/testing.go @@ -7,11 +7,11 @@ import ( "testing" "github.com/hashicorp/go-version" - "github.com/hashicorp/nomad/helper/testlog" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/nomad/state" - "github.com/hashicorp/nomad/nomad/structs" - sstructs "github.com/hashicorp/nomad/scheduler/structs" + "github.com/hashicorp/nomad/v2/helper/testlog" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/nomad/state" + "github.com/hashicorp/nomad/v2/nomad/structs" + sstructs "github.com/hashicorp/nomad/v2/scheduler/structs" "github.com/shoenig/test/must" ) diff --git a/scheduler/util.go b/scheduler/util.go index 955da6a658b..e3120937f55 100644 --- a/scheduler/util.go +++ b/scheduler/util.go @@ -11,11 +11,11 @@ import ( log "github.com/hashicorp/go-hclog" memdb "github.com/hashicorp/go-memdb" "github.com/hashicorp/go-set/v3" - "github.com/hashicorp/nomad/helper" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/scheduler/feasible" - "github.com/hashicorp/nomad/scheduler/reconciler" - sstructs "github.com/hashicorp/nomad/scheduler/structs" + "github.com/hashicorp/nomad/v2/helper" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/scheduler/feasible" + "github.com/hashicorp/nomad/v2/scheduler/reconciler" + sstructs "github.com/hashicorp/nomad/v2/scheduler/structs" ) // readyNodesInDCsAndPool returns all the ready nodes in the given datacenters diff --git a/scheduler/util_test.go b/scheduler/util_test.go index 001bbbd802c..6cfa7eb8e9e 100644 --- a/scheduler/util_test.go +++ b/scheduler/util_test.go @@ -7,15 +7,15 @@ import ( "testing" "time" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/helper/testlog" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/nomad/mock" - "github.com/hashicorp/nomad/nomad/state" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/scheduler/feasible" - "github.com/hashicorp/nomad/scheduler/reconciler" - "github.com/hashicorp/nomad/scheduler/tests" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/helper/testlog" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/nomad/mock" + "github.com/hashicorp/nomad/v2/nomad/state" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/scheduler/feasible" + "github.com/hashicorp/nomad/v2/scheduler/reconciler" + "github.com/hashicorp/nomad/v2/scheduler/tests" "github.com/shoenig/test/must" ) diff --git a/testutil/server.go b/testutil/server.go index 54c62421269..75199f4dd60 100644 --- a/testutil/server.go +++ b/testutil/server.go @@ -26,8 +26,8 @@ import ( "time" cleanhttp "github.com/hashicorp/go-cleanhttp" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/helper/discover" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/helper/discover" "github.com/shoenig/test/must" ) diff --git a/testutil/tls.go b/testutil/tls.go index ccac549947c..add09515aed 100644 --- a/testutil/tls.go +++ b/testutil/tls.go @@ -9,7 +9,7 @@ import ( "os" "testing" - "github.com/hashicorp/nomad/helper/tlsutil" + "github.com/hashicorp/nomad/v2/helper/tlsutil" "github.com/shoenig/test/must" ) diff --git a/testutil/vault.go b/testutil/vault.go index 5515e614599..15ebb49abd3 100644 --- a/testutil/vault.go +++ b/testutil/vault.go @@ -12,12 +12,12 @@ import ( "time" "github.com/hashicorp/go-hclog" - "github.com/hashicorp/nomad/ci" - "github.com/hashicorp/nomad/helper/testlog" - "github.com/hashicorp/nomad/helper/useragent" - "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/nomad/structs/config" + "github.com/hashicorp/nomad/v2/ci" + "github.com/hashicorp/nomad/v2/helper/testlog" + "github.com/hashicorp/nomad/v2/helper/useragent" + "github.com/hashicorp/nomad/v2/helper/uuid" + "github.com/hashicorp/nomad/v2/nomad/structs" + "github.com/hashicorp/nomad/v2/nomad/structs/config" vapi "github.com/hashicorp/vault/api" ) diff --git a/testutil/wait.go b/testutil/wait.go index 6a344f5dd2d..9348e236e79 100644 --- a/testutil/wait.go +++ b/testutil/wait.go @@ -15,7 +15,7 @@ import ( "github.com/shoenig/test/must" "github.com/shoenig/test/wait" - "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/v2/nomad/structs" ) type testFn func() (bool, error) diff --git a/tools/buf/buf.gen.yaml b/tools/buf/buf.gen.yaml index f8dd97a41ff..81dabb88d54 100644 --- a/tools/buf/buf.gen.yaml +++ b/tools/buf/buf.gen.yaml @@ -11,9 +11,9 @@ plugins: ## necessary when a proto file foo/a.proto imports a proto file from another ## directory, e.g. bar/b.proto opt: "plugins=grpc\ - ,Mplugins/shared/hclspec/hcl_spec.proto=github.com/hashicorp/nomad/plugins/shared/hclspec\ - ,Mplugins/shared/structs/proto/stats.proto=github.com/hashicorp/nomad/plugins/shared/structs/proto\ - ,Mplugins/shared/structs/proto/attribute.proto=github.com/hashicorp/nomad/plugins/shared/structs/proto\ - ,Mplugins/shared/structs/proto/recoverable_error.proto=github.com/hashicorp/nomad/plugins/shared/structs/proto\ - ,Mplugins/drivers/proto/driver.proto=github.com/hashicorp/nomad/plugins/drivers/proto\ + ,Mplugins/shared/hclspec/hcl_spec.proto=github.com/hashicorp/nomad/v2/plugins/shared/hclspec\ + ,Mplugins/shared/structs/proto/stats.proto=github.com/hashicorp/nomad/v2/plugins/shared/structs/proto\ + ,Mplugins/shared/structs/proto/attribute.proto=github.com/hashicorp/nomad/v2/plugins/shared/structs/proto\ + ,Mplugins/shared/structs/proto/recoverable_error.proto=github.com/hashicorp/nomad/v2/plugins/shared/structs/proto\ + ,Mplugins/drivers/proto/driver.proto=github.com/hashicorp/nomad/v2/plugins/drivers/proto\ "