diff --git a/agent/action/add_persistent_disk.go b/agent/action/add_persistent_disk.go index 10f0c582b..4804494c3 100644 --- a/agent/action/add_persistent_disk.go +++ b/agent/action/add_persistent_disk.go @@ -3,7 +3,7 @@ package action import ( "errors" - boshsettings "github.com/cloudfoundry/bosh-agent/settings" + boshsettings "github.com/cloudfoundry/bosh-agent/v2/settings" bosherr "github.com/cloudfoundry/bosh-utils/errors" ) diff --git a/agent/action/add_persistent_disk_test.go b/agent/action/add_persistent_disk_test.go index 74ccf4ac1..3b3c8bb57 100644 --- a/agent/action/add_persistent_disk_test.go +++ b/agent/action/add_persistent_disk_test.go @@ -1,8 +1,8 @@ package action import ( - "github.com/cloudfoundry/bosh-agent/settings" - fakesettings "github.com/cloudfoundry/bosh-agent/settings/fakes" + "github.com/cloudfoundry/bosh-agent/v2/settings" + fakesettings "github.com/cloudfoundry/bosh-agent/v2/settings/fakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/pkg/errors" diff --git a/agent/action/apply.go b/agent/action/apply.go index 5eee8c17b..1bd93cc4d 100644 --- a/agent/action/apply.go +++ b/agent/action/apply.go @@ -5,12 +5,12 @@ import ( "os" "path" - boshappl "github.com/cloudfoundry/bosh-agent/agent/applier" - boshas "github.com/cloudfoundry/bosh-agent/agent/applier/applyspec" - boshsettings "github.com/cloudfoundry/bosh-agent/settings" + boshappl "github.com/cloudfoundry/bosh-agent/v2/agent/applier" + boshas "github.com/cloudfoundry/bosh-agent/v2/agent/applier/applyspec" + boshsettings "github.com/cloudfoundry/bosh-agent/v2/settings" bosherr "github.com/cloudfoundry/bosh-utils/errors" - "github.com/cloudfoundry/bosh-agent/settings/directories" + "github.com/cloudfoundry/bosh-agent/v2/settings/directories" boshsys "github.com/cloudfoundry/bosh-utils/system" ) diff --git a/agent/action/apply_test.go b/agent/action/apply_test.go index 03223354a..b1bf3e859 100644 --- a/agent/action/apply_test.go +++ b/agent/action/apply_test.go @@ -7,13 +7,13 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/cloudfoundry/bosh-agent/agent/action" - boshas "github.com/cloudfoundry/bosh-agent/agent/applier/applyspec" - fakeas "github.com/cloudfoundry/bosh-agent/agent/applier/applyspec/fakes" - fakeappl "github.com/cloudfoundry/bosh-agent/agent/applier/fakes" - boshsettings "github.com/cloudfoundry/bosh-agent/settings" - boshdir "github.com/cloudfoundry/bosh-agent/settings/directories" - fakesettings "github.com/cloudfoundry/bosh-agent/settings/fakes" + "github.com/cloudfoundry/bosh-agent/v2/agent/action" + boshas "github.com/cloudfoundry/bosh-agent/v2/agent/applier/applyspec" + fakeas "github.com/cloudfoundry/bosh-agent/v2/agent/applier/applyspec/fakes" + fakeappl "github.com/cloudfoundry/bosh-agent/v2/agent/applier/fakes" + boshsettings "github.com/cloudfoundry/bosh-agent/v2/settings" + boshdir "github.com/cloudfoundry/bosh-agent/v2/settings/directories" + fakesettings "github.com/cloudfoundry/bosh-agent/v2/settings/fakes" boshsys "github.com/cloudfoundry/bosh-utils/system" fakesys "github.com/cloudfoundry/bosh-utils/system/fakes" ) diff --git a/agent/action/bundle_logs.go b/agent/action/bundle_logs.go index bf339e7c9..561a50d50 100644 --- a/agent/action/bundle_logs.go +++ b/agent/action/bundle_logs.go @@ -6,7 +6,7 @@ import ( boshcrypto "github.com/cloudfoundry/bosh-utils/crypto" boshsys "github.com/cloudfoundry/bosh-utils/system" - "github.com/cloudfoundry/bosh-agent/agent/logstarprovider" + "github.com/cloudfoundry/bosh-agent/v2/agent/logstarprovider" ) type BundleLogsAction struct { diff --git a/agent/action/bundle_logs_test.go b/agent/action/bundle_logs_test.go index 7d88f7e4c..3d619b3ed 100644 --- a/agent/action/bundle_logs_test.go +++ b/agent/action/bundle_logs_test.go @@ -6,12 +6,12 @@ import ( boshassert "github.com/cloudfoundry/bosh-utils/assert" fakesys "github.com/cloudfoundry/bosh-utils/system/fakes" - fakelogstarprovider "github.com/cloudfoundry/bosh-agent/agent/logstarprovider/logstarproviderfakes" + fakelogstarprovider "github.com/cloudfoundry/bosh-agent/v2/agent/logstarprovider/logstarproviderfakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/cloudfoundry/bosh-agent/agent/action" + . "github.com/cloudfoundry/bosh-agent/v2/agent/action" ) var _ = Describe("FetchLogsAction", func() { diff --git a/agent/action/cancel_task.go b/agent/action/cancel_task.go index cb0238fa6..1cd139157 100644 --- a/agent/action/cancel_task.go +++ b/agent/action/cancel_task.go @@ -3,7 +3,7 @@ package action import ( "errors" - boshtask "github.com/cloudfoundry/bosh-agent/agent/task" + boshtask "github.com/cloudfoundry/bosh-agent/v2/agent/task" bosherr "github.com/cloudfoundry/bosh-utils/errors" ) diff --git a/agent/action/cancel_task_test.go b/agent/action/cancel_task_test.go index 066c03bea..518ae3593 100644 --- a/agent/action/cancel_task_test.go +++ b/agent/action/cancel_task_test.go @@ -6,9 +6,9 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - boshaction "github.com/cloudfoundry/bosh-agent/agent/action" - boshtask "github.com/cloudfoundry/bosh-agent/agent/task" - faketask "github.com/cloudfoundry/bosh-agent/agent/task/fakes" + boshaction "github.com/cloudfoundry/bosh-agent/v2/agent/action" + boshtask "github.com/cloudfoundry/bosh-agent/v2/agent/task" + faketask "github.com/cloudfoundry/bosh-agent/v2/agent/task/fakes" ) var _ = Describe("CancelTaskAction", func() { diff --git a/agent/action/compile_package.go b/agent/action/compile_package.go index 1a7c40f2a..f39f46520 100644 --- a/agent/action/compile_package.go +++ b/agent/action/compile_package.go @@ -3,8 +3,8 @@ package action import ( "errors" - boshmodels "github.com/cloudfoundry/bosh-agent/agent/applier/models" - boshcomp "github.com/cloudfoundry/bosh-agent/agent/compiler" + boshmodels "github.com/cloudfoundry/bosh-agent/v2/agent/applier/models" + boshcomp "github.com/cloudfoundry/bosh-agent/v2/agent/compiler" boshcrypto "github.com/cloudfoundry/bosh-utils/crypto" bosherr "github.com/cloudfoundry/bosh-utils/errors" ) diff --git a/agent/action/compile_package_test.go b/agent/action/compile_package_test.go index 6817b6456..48f4d7e12 100644 --- a/agent/action/compile_package_test.go +++ b/agent/action/compile_package_test.go @@ -7,10 +7,10 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - boshaction "github.com/cloudfoundry/bosh-agent/agent/action" - boshmodels "github.com/cloudfoundry/bosh-agent/agent/applier/models" - boshcomp "github.com/cloudfoundry/bosh-agent/agent/compiler" - fakecomp "github.com/cloudfoundry/bosh-agent/agent/compiler/fakes" + boshaction "github.com/cloudfoundry/bosh-agent/v2/agent/action" + boshmodels "github.com/cloudfoundry/bosh-agent/v2/agent/applier/models" + boshcomp "github.com/cloudfoundry/bosh-agent/v2/agent/compiler" + fakecomp "github.com/cloudfoundry/bosh-agent/v2/agent/compiler/fakes" boshcrypto "github.com/cloudfoundry/bosh-utils/crypto" ) diff --git a/agent/action/compile_package_with_signed_url.go b/agent/action/compile_package_with_signed_url.go index 34a2408cb..96a23adbe 100644 --- a/agent/action/compile_package_with_signed_url.go +++ b/agent/action/compile_package_with_signed_url.go @@ -3,8 +3,8 @@ package action import ( "errors" - boshmodels "github.com/cloudfoundry/bosh-agent/agent/applier/models" - boshcomp "github.com/cloudfoundry/bosh-agent/agent/compiler" + boshmodels "github.com/cloudfoundry/bosh-agent/v2/agent/applier/models" + boshcomp "github.com/cloudfoundry/bosh-agent/v2/agent/compiler" boshcrypto "github.com/cloudfoundry/bosh-utils/crypto" bosherr "github.com/cloudfoundry/bosh-utils/errors" ) diff --git a/agent/action/compile_package_with_signed_url_test.go b/agent/action/compile_package_with_signed_url_test.go index 948996f15..2a2e42a8f 100644 --- a/agent/action/compile_package_with_signed_url_test.go +++ b/agent/action/compile_package_with_signed_url_test.go @@ -7,10 +7,10 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - boshaction "github.com/cloudfoundry/bosh-agent/agent/action" - boshmodels "github.com/cloudfoundry/bosh-agent/agent/applier/models" - boshcomp "github.com/cloudfoundry/bosh-agent/agent/compiler" - fakecomp "github.com/cloudfoundry/bosh-agent/agent/compiler/fakes" + boshaction "github.com/cloudfoundry/bosh-agent/v2/agent/action" + boshmodels "github.com/cloudfoundry/bosh-agent/v2/agent/applier/models" + boshcomp "github.com/cloudfoundry/bosh-agent/v2/agent/compiler" + fakecomp "github.com/cloudfoundry/bosh-agent/v2/agent/compiler/fakes" boshcrypto "github.com/cloudfoundry/bosh-utils/crypto" ) diff --git a/agent/action/concrete_factory.go b/agent/action/concrete_factory.go index 86c3c876d..42132ac2b 100644 --- a/agent/action/concrete_factory.go +++ b/agent/action/concrete_factory.go @@ -1,18 +1,18 @@ package action import ( - boshappl "github.com/cloudfoundry/bosh-agent/agent/applier" - boshas "github.com/cloudfoundry/bosh-agent/agent/applier/applyspec" - boshagentblob "github.com/cloudfoundry/bosh-agent/agent/blobstore" - boshcomp "github.com/cloudfoundry/bosh-agent/agent/compiler" - blobdelegator "github.com/cloudfoundry/bosh-agent/agent/httpblobprovider/blobstore_delegator" - boshscript "github.com/cloudfoundry/bosh-agent/agent/script" - boshtask "github.com/cloudfoundry/bosh-agent/agent/task" - "github.com/cloudfoundry/bosh-agent/agent/utils" - boshjobsuper "github.com/cloudfoundry/bosh-agent/jobsupervisor" - boshnotif "github.com/cloudfoundry/bosh-agent/notification" - boshplatform "github.com/cloudfoundry/bosh-agent/platform" - boshsettings "github.com/cloudfoundry/bosh-agent/settings" + boshappl "github.com/cloudfoundry/bosh-agent/v2/agent/applier" + boshas "github.com/cloudfoundry/bosh-agent/v2/agent/applier/applyspec" + boshagentblob "github.com/cloudfoundry/bosh-agent/v2/agent/blobstore" + boshcomp "github.com/cloudfoundry/bosh-agent/v2/agent/compiler" + blobdelegator "github.com/cloudfoundry/bosh-agent/v2/agent/httpblobprovider/blobstore_delegator" + boshscript "github.com/cloudfoundry/bosh-agent/v2/agent/script" + boshtask "github.com/cloudfoundry/bosh-agent/v2/agent/task" + "github.com/cloudfoundry/bosh-agent/v2/agent/utils" + boshjobsuper "github.com/cloudfoundry/bosh-agent/v2/jobsupervisor" + boshnotif "github.com/cloudfoundry/bosh-agent/v2/notification" + boshplatform "github.com/cloudfoundry/bosh-agent/v2/platform" + boshsettings "github.com/cloudfoundry/bosh-agent/v2/settings" bosherr "github.com/cloudfoundry/bosh-utils/errors" boshlog "github.com/cloudfoundry/bosh-utils/logger" ) diff --git a/agent/action/concrete_factory_test.go b/agent/action/concrete_factory_test.go index d65c61e82..26b4625ef 100644 --- a/agent/action/concrete_factory_test.go +++ b/agent/action/concrete_factory_test.go @@ -4,26 +4,26 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/cloudfoundry/bosh-agent/agent/script/scriptfakes" - "github.com/cloudfoundry/bosh-agent/platform/platformfakes" + "github.com/cloudfoundry/bosh-agent/v2/agent/script/scriptfakes" + "github.com/cloudfoundry/bosh-agent/v2/platform/platformfakes" boshlog "github.com/cloudfoundry/bosh-utils/logger" - boshaction "github.com/cloudfoundry/bosh-agent/agent/action" - boshscript "github.com/cloudfoundry/bosh-agent/agent/script" - boshdir "github.com/cloudfoundry/bosh-agent/settings/directories" + boshaction "github.com/cloudfoundry/bosh-agent/v2/agent/action" + boshscript "github.com/cloudfoundry/bosh-agent/v2/agent/script" + boshdir "github.com/cloudfoundry/bosh-agent/v2/settings/directories" fakesys "github.com/cloudfoundry/bosh-utils/system/fakes" - fakeas "github.com/cloudfoundry/bosh-agent/agent/applier/applyspec/fakes" - fakeappl "github.com/cloudfoundry/bosh-agent/agent/applier/fakes" - fakeagentblobstore "github.com/cloudfoundry/bosh-agent/agent/blobstore/blobstorefakes" - fakecomp "github.com/cloudfoundry/bosh-agent/agent/compiler/fakes" - fakeblobdelegator "github.com/cloudfoundry/bosh-agent/agent/httpblobprovider/blobstore_delegator/blobstore_delegatorfakes" - faketask "github.com/cloudfoundry/bosh-agent/agent/task/fakes" - fakejobsuper "github.com/cloudfoundry/bosh-agent/jobsupervisor/fakes" - fakenotif "github.com/cloudfoundry/bosh-agent/notification/fakes" - fakesettings "github.com/cloudfoundry/bosh-agent/settings/fakes" + fakeas "github.com/cloudfoundry/bosh-agent/v2/agent/applier/applyspec/fakes" + fakeappl "github.com/cloudfoundry/bosh-agent/v2/agent/applier/fakes" + fakeagentblobstore "github.com/cloudfoundry/bosh-agent/v2/agent/blobstore/blobstorefakes" + fakecomp "github.com/cloudfoundry/bosh-agent/v2/agent/compiler/fakes" + fakeblobdelegator "github.com/cloudfoundry/bosh-agent/v2/agent/httpblobprovider/blobstore_delegator/blobstore_delegatorfakes" + faketask "github.com/cloudfoundry/bosh-agent/v2/agent/task/fakes" + fakejobsuper "github.com/cloudfoundry/bosh-agent/v2/jobsupervisor/fakes" + fakenotif "github.com/cloudfoundry/bosh-agent/v2/notification/fakes" + fakesettings "github.com/cloudfoundry/bosh-agent/v2/settings/fakes" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 -o fakes/fake_clock.go code.cloudfoundry.org/clock.Clock diff --git a/agent/action/delete_arp_entries.go b/agent/action/delete_arp_entries.go index 68d00db16..2d9d15099 100644 --- a/agent/action/delete_arp_entries.go +++ b/agent/action/delete_arp_entries.go @@ -3,7 +3,7 @@ package action import ( "errors" - boshplatform "github.com/cloudfoundry/bosh-agent/platform" + boshplatform "github.com/cloudfoundry/bosh-agent/v2/platform" ) type DeleteARPEntriesActionArgs struct { diff --git a/agent/action/delete_arp_entries_test.go b/agent/action/delete_arp_entries_test.go index df6262cf8..824f32673 100644 --- a/agent/action/delete_arp_entries_test.go +++ b/agent/action/delete_arp_entries_test.go @@ -4,8 +4,8 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/cloudfoundry/bosh-agent/agent/action" - "github.com/cloudfoundry/bosh-agent/platform/platformfakes" + "github.com/cloudfoundry/bosh-agent/v2/agent/action" + "github.com/cloudfoundry/bosh-agent/v2/platform/platformfakes" ) var _ = Describe("Delete ARP Entries", func() { diff --git a/agent/action/drain.go b/agent/action/drain.go index 9f595c0a3..bbb6de9e9 100644 --- a/agent/action/drain.go +++ b/agent/action/drain.go @@ -3,11 +3,11 @@ package action import ( "errors" - boshas "github.com/cloudfoundry/bosh-agent/agent/applier/applyspec" - boshscript "github.com/cloudfoundry/bosh-agent/agent/script" - boshdrain "github.com/cloudfoundry/bosh-agent/agent/script/drain" - boshjobsuper "github.com/cloudfoundry/bosh-agent/jobsupervisor" - boshnotif "github.com/cloudfoundry/bosh-agent/notification" + boshas "github.com/cloudfoundry/bosh-agent/v2/agent/applier/applyspec" + boshscript "github.com/cloudfoundry/bosh-agent/v2/agent/script" + boshdrain "github.com/cloudfoundry/bosh-agent/v2/agent/script/drain" + boshjobsuper "github.com/cloudfoundry/bosh-agent/v2/jobsupervisor" + boshnotif "github.com/cloudfoundry/bosh-agent/v2/notification" bosherr "github.com/cloudfoundry/bosh-utils/errors" boshlog "github.com/cloudfoundry/bosh-utils/logger" ) diff --git a/agent/action/drain_test.go b/agent/action/drain_test.go index 722d35664..2b4e85d7f 100644 --- a/agent/action/drain_test.go +++ b/agent/action/drain_test.go @@ -6,14 +6,14 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/cloudfoundry/bosh-agent/agent/action" - boshas "github.com/cloudfoundry/bosh-agent/agent/applier/applyspec" - fakeas "github.com/cloudfoundry/bosh-agent/agent/applier/applyspec/fakes" - boshscript "github.com/cloudfoundry/bosh-agent/agent/script" - boshdrain "github.com/cloudfoundry/bosh-agent/agent/script/drain" - "github.com/cloudfoundry/bosh-agent/agent/script/scriptfakes" - fakejobsuper "github.com/cloudfoundry/bosh-agent/jobsupervisor/fakes" - fakenotif "github.com/cloudfoundry/bosh-agent/notification/fakes" + "github.com/cloudfoundry/bosh-agent/v2/agent/action" + boshas "github.com/cloudfoundry/bosh-agent/v2/agent/applier/applyspec" + fakeas "github.com/cloudfoundry/bosh-agent/v2/agent/applier/applyspec/fakes" + boshscript "github.com/cloudfoundry/bosh-agent/v2/agent/script" + boshdrain "github.com/cloudfoundry/bosh-agent/v2/agent/script/drain" + "github.com/cloudfoundry/bosh-agent/v2/agent/script/scriptfakes" + fakejobsuper "github.com/cloudfoundry/bosh-agent/v2/jobsupervisor/fakes" + fakenotif "github.com/cloudfoundry/bosh-agent/v2/notification/fakes" "github.com/cloudfoundry/bosh-utils/crypto" boshlog "github.com/cloudfoundry/bosh-utils/logger" ) diff --git a/agent/action/fakes/fake_factory.go b/agent/action/fakes/fake_factory.go index 94675d8c1..1eaea47e0 100644 --- a/agent/action/fakes/fake_factory.go +++ b/agent/action/fakes/fake_factory.go @@ -4,7 +4,7 @@ import ( "errors" "fmt" - boshaction "github.com/cloudfoundry/bosh-agent/agent/action" + boshaction "github.com/cloudfoundry/bosh-agent/v2/agent/action" ) type FakeFactory struct { diff --git a/agent/action/fakes/fake_runner.go b/agent/action/fakes/fake_runner.go index e0a9682ae..5044ee131 100644 --- a/agent/action/fakes/fake_runner.go +++ b/agent/action/fakes/fake_runner.go @@ -1,7 +1,7 @@ package fakes import ( - boshaction "github.com/cloudfoundry/bosh-agent/agent/action" + boshaction "github.com/cloudfoundry/bosh-agent/v2/agent/action" ) type FakeRunner struct { diff --git a/agent/action/fetch_logs.go b/agent/action/fetch_logs.go index 3b758f7db..c9c9d45f1 100644 --- a/agent/action/fetch_logs.go +++ b/agent/action/fetch_logs.go @@ -3,11 +3,11 @@ package action import ( "errors" - "github.com/cloudfoundry/bosh-agent/agent/logstarprovider" + "github.com/cloudfoundry/bosh-agent/v2/agent/logstarprovider" bosherr "github.com/cloudfoundry/bosh-utils/errors" - blobdelegator "github.com/cloudfoundry/bosh-agent/agent/httpblobprovider/blobstore_delegator" + blobdelegator "github.com/cloudfoundry/bosh-agent/v2/agent/httpblobprovider/blobstore_delegator" ) type FetchLogsAction struct { diff --git a/agent/action/fetch_logs_test.go b/agent/action/fetch_logs_test.go index 933df0a8f..be566450d 100644 --- a/agent/action/fetch_logs_test.go +++ b/agent/action/fetch_logs_test.go @@ -6,13 +6,13 @@ import ( boshassert "github.com/cloudfoundry/bosh-utils/assert" boshcrypto "github.com/cloudfoundry/bosh-utils/crypto" - fakeblobdelegator "github.com/cloudfoundry/bosh-agent/agent/httpblobprovider/blobstore_delegator/blobstore_delegatorfakes" - fakelogstarprovider "github.com/cloudfoundry/bosh-agent/agent/logstarprovider/logstarproviderfakes" + fakeblobdelegator "github.com/cloudfoundry/bosh-agent/v2/agent/httpblobprovider/blobstore_delegator/blobstore_delegatorfakes" + fakelogstarprovider "github.com/cloudfoundry/bosh-agent/v2/agent/logstarprovider/logstarproviderfakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/cloudfoundry/bosh-agent/agent/action" + . "github.com/cloudfoundry/bosh-agent/v2/agent/action" ) var _ = Describe("FetchLogsAction", func() { diff --git a/agent/action/fetch_logs_with_signed_url.go b/agent/action/fetch_logs_with_signed_url.go index 705dec919..89d870bcf 100644 --- a/agent/action/fetch_logs_with_signed_url.go +++ b/agent/action/fetch_logs_with_signed_url.go @@ -3,11 +3,11 @@ package action import ( "errors" - "github.com/cloudfoundry/bosh-agent/agent/logstarprovider" + "github.com/cloudfoundry/bosh-agent/v2/agent/logstarprovider" bosherr "github.com/cloudfoundry/bosh-utils/errors" - blobdelegator "github.com/cloudfoundry/bosh-agent/agent/httpblobprovider/blobstore_delegator" + blobdelegator "github.com/cloudfoundry/bosh-agent/v2/agent/httpblobprovider/blobstore_delegator" ) type FetchLogsWithSignedURLRequest struct { diff --git a/agent/action/fetch_logs_with_signed_url_test.go b/agent/action/fetch_logs_with_signed_url_test.go index b52badf5d..94a8f8de7 100644 --- a/agent/action/fetch_logs_with_signed_url_test.go +++ b/agent/action/fetch_logs_with_signed_url_test.go @@ -3,15 +3,15 @@ package action_test import ( "errors" - fakelogstarprovider "github.com/cloudfoundry/bosh-agent/agent/logstarprovider/logstarproviderfakes" + fakelogstarprovider "github.com/cloudfoundry/bosh-agent/v2/agent/logstarprovider/logstarproviderfakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" boshassert "github.com/cloudfoundry/bosh-utils/assert" boshcrypto "github.com/cloudfoundry/bosh-utils/crypto" - boshaction "github.com/cloudfoundry/bosh-agent/agent/action" - fakeblobdelegator "github.com/cloudfoundry/bosh-agent/agent/httpblobprovider/blobstore_delegator/blobstore_delegatorfakes" + boshaction "github.com/cloudfoundry/bosh-agent/v2/agent/action" + fakeblobdelegator "github.com/cloudfoundry/bosh-agent/v2/agent/httpblobprovider/blobstore_delegator/blobstore_delegatorfakes" ) var _ = Describe("FetchLogsWithSignedURLAction", func() { diff --git a/agent/action/get_state.go b/agent/action/get_state.go index cbfb08d4e..7b00b2fb3 100644 --- a/agent/action/get_state.go +++ b/agent/action/get_state.go @@ -3,10 +3,10 @@ package action import ( "errors" - boshas "github.com/cloudfoundry/bosh-agent/agent/applier/applyspec" - boshjobsuper "github.com/cloudfoundry/bosh-agent/jobsupervisor" - boshvitals "github.com/cloudfoundry/bosh-agent/platform/vitals" - boshsettings "github.com/cloudfoundry/bosh-agent/settings" + boshas "github.com/cloudfoundry/bosh-agent/v2/agent/applier/applyspec" + boshjobsuper "github.com/cloudfoundry/bosh-agent/v2/jobsupervisor" + boshvitals "github.com/cloudfoundry/bosh-agent/v2/platform/vitals" + boshsettings "github.com/cloudfoundry/bosh-agent/v2/settings" bosherr "github.com/cloudfoundry/bosh-utils/errors" ) diff --git a/agent/action/get_state_test.go b/agent/action/get_state_test.go index 40f9894e9..21ff4058b 100644 --- a/agent/action/get_state_test.go +++ b/agent/action/get_state_test.go @@ -6,15 +6,15 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/cloudfoundry/bosh-agent/agent/action" - boshas "github.com/cloudfoundry/bosh-agent/agent/applier/applyspec" - fakeas "github.com/cloudfoundry/bosh-agent/agent/applier/applyspec/fakes" - boshjobsuper "github.com/cloudfoundry/bosh-agent/jobsupervisor" - fakejobsuper "github.com/cloudfoundry/bosh-agent/jobsupervisor/fakes" - boshvitals "github.com/cloudfoundry/bosh-agent/platform/vitals" - "github.com/cloudfoundry/bosh-agent/platform/vitals/vitalsfakes" - boshsettings "github.com/cloudfoundry/bosh-agent/settings" - fakesettings "github.com/cloudfoundry/bosh-agent/settings/fakes" + "github.com/cloudfoundry/bosh-agent/v2/agent/action" + boshas "github.com/cloudfoundry/bosh-agent/v2/agent/applier/applyspec" + fakeas "github.com/cloudfoundry/bosh-agent/v2/agent/applier/applyspec/fakes" + boshjobsuper "github.com/cloudfoundry/bosh-agent/v2/jobsupervisor" + fakejobsuper "github.com/cloudfoundry/bosh-agent/v2/jobsupervisor/fakes" + boshvitals "github.com/cloudfoundry/bosh-agent/v2/platform/vitals" + "github.com/cloudfoundry/bosh-agent/v2/platform/vitals/vitalsfakes" + boshsettings "github.com/cloudfoundry/bosh-agent/v2/settings" + fakesettings "github.com/cloudfoundry/bosh-agent/v2/settings/fakes" boshassert "github.com/cloudfoundry/bosh-utils/assert" ) diff --git a/agent/action/get_task.go b/agent/action/get_task.go index 7349313a7..2b3b8d738 100644 --- a/agent/action/get_task.go +++ b/agent/action/get_task.go @@ -3,7 +3,7 @@ package action import ( "errors" - boshtask "github.com/cloudfoundry/bosh-agent/agent/task" + boshtask "github.com/cloudfoundry/bosh-agent/v2/agent/task" bosherr "github.com/cloudfoundry/bosh-utils/errors" ) diff --git a/agent/action/get_task_test.go b/agent/action/get_task_test.go index 7d17522ec..49f3086bd 100644 --- a/agent/action/get_task_test.go +++ b/agent/action/get_task_test.go @@ -6,9 +6,9 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/cloudfoundry/bosh-agent/agent/action" - boshtask "github.com/cloudfoundry/bosh-agent/agent/task" - faketask "github.com/cloudfoundry/bosh-agent/agent/task/fakes" + "github.com/cloudfoundry/bosh-agent/v2/agent/action" + boshtask "github.com/cloudfoundry/bosh-agent/v2/agent/task" + faketask "github.com/cloudfoundry/bosh-agent/v2/agent/task/fakes" boshassert "github.com/cloudfoundry/bosh-utils/assert" ) diff --git a/agent/action/info_test.go b/agent/action/info_test.go index 68740ee07..7b1c48111 100644 --- a/agent/action/info_test.go +++ b/agent/action/info_test.go @@ -4,7 +4,7 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/cloudfoundry/bosh-agent/agent/action" + "github.com/cloudfoundry/bosh-agent/v2/agent/action" ) var _ = Describe("Info", func() { diff --git a/agent/action/list_disk.go b/agent/action/list_disk.go index db7b35177..c17f37dd0 100644 --- a/agent/action/list_disk.go +++ b/agent/action/list_disk.go @@ -3,8 +3,8 @@ package action import ( "errors" - boshplatform "github.com/cloudfoundry/bosh-agent/platform" - boshsettings "github.com/cloudfoundry/bosh-agent/settings" + boshplatform "github.com/cloudfoundry/bosh-agent/v2/platform" + boshsettings "github.com/cloudfoundry/bosh-agent/v2/settings" bosherr "github.com/cloudfoundry/bosh-utils/errors" boshlog "github.com/cloudfoundry/bosh-utils/logger" ) diff --git a/agent/action/list_disk_test.go b/agent/action/list_disk_test.go index 638db6f78..7773c92f4 100644 --- a/agent/action/list_disk_test.go +++ b/agent/action/list_disk_test.go @@ -4,10 +4,10 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/cloudfoundry/bosh-agent/agent/action" - "github.com/cloudfoundry/bosh-agent/platform/platformfakes" - boshsettings "github.com/cloudfoundry/bosh-agent/settings" - fakesettings "github.com/cloudfoundry/bosh-agent/settings/fakes" + "github.com/cloudfoundry/bosh-agent/v2/agent/action" + "github.com/cloudfoundry/bosh-agent/v2/platform/platformfakes" + boshsettings "github.com/cloudfoundry/bosh-agent/v2/settings" + fakesettings "github.com/cloudfoundry/bosh-agent/v2/settings/fakes" bosherrors "github.com/cloudfoundry/bosh-utils/errors" boshlog "github.com/cloudfoundry/bosh-utils/logger" ) diff --git a/agent/action/migrate_disk.go b/agent/action/migrate_disk.go index d59d29ae5..6e9018418 100644 --- a/agent/action/migrate_disk.go +++ b/agent/action/migrate_disk.go @@ -3,8 +3,8 @@ package action import ( "errors" - boshplatform "github.com/cloudfoundry/bosh-agent/platform" - boshdirs "github.com/cloudfoundry/bosh-agent/settings/directories" + boshplatform "github.com/cloudfoundry/bosh-agent/v2/platform" + boshdirs "github.com/cloudfoundry/bosh-agent/v2/settings/directories" bosherr "github.com/cloudfoundry/bosh-utils/errors" ) diff --git a/agent/action/migrate_disk_test.go b/agent/action/migrate_disk_test.go index 9b28d21b4..2846405e2 100644 --- a/agent/action/migrate_disk_test.go +++ b/agent/action/migrate_disk_test.go @@ -4,9 +4,9 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/cloudfoundry/bosh-agent/agent/action" - "github.com/cloudfoundry/bosh-agent/platform/platformfakes" - boshdirs "github.com/cloudfoundry/bosh-agent/settings/directories" + "github.com/cloudfoundry/bosh-agent/v2/agent/action" + "github.com/cloudfoundry/bosh-agent/v2/platform/platformfakes" + boshdirs "github.com/cloudfoundry/bosh-agent/v2/settings/directories" boshassert "github.com/cloudfoundry/bosh-utils/assert" ) diff --git a/agent/action/mount_disk.go b/agent/action/mount_disk.go index 0e2202efd..a1b1a351e 100644 --- a/agent/action/mount_disk.go +++ b/agent/action/mount_disk.go @@ -3,8 +3,8 @@ package action import ( "errors" - boshsettings "github.com/cloudfoundry/bosh-agent/settings" - boshdirs "github.com/cloudfoundry/bosh-agent/settings/directories" + boshsettings "github.com/cloudfoundry/bosh-agent/v2/settings" + boshdirs "github.com/cloudfoundry/bosh-agent/v2/settings/directories" bosherr "github.com/cloudfoundry/bosh-utils/errors" boshlog "github.com/cloudfoundry/bosh-utils/logger" ) diff --git a/agent/action/mount_disk_test.go b/agent/action/mount_disk_test.go index 65ec5ba64..d95e47d0c 100644 --- a/agent/action/mount_disk_test.go +++ b/agent/action/mount_disk_test.go @@ -6,11 +6,11 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/cloudfoundry/bosh-agent/agent/action" - "github.com/cloudfoundry/bosh-agent/platform/platformfakes" - boshsettings "github.com/cloudfoundry/bosh-agent/settings" - boshdirs "github.com/cloudfoundry/bosh-agent/settings/directories" - fakesettings "github.com/cloudfoundry/bosh-agent/settings/fakes" + "github.com/cloudfoundry/bosh-agent/v2/agent/action" + "github.com/cloudfoundry/bosh-agent/v2/platform/platformfakes" + boshsettings "github.com/cloudfoundry/bosh-agent/v2/settings" + boshdirs "github.com/cloudfoundry/bosh-agent/v2/settings/directories" + fakesettings "github.com/cloudfoundry/bosh-agent/v2/settings/fakes" boshassert "github.com/cloudfoundry/bosh-utils/assert" boshlog "github.com/cloudfoundry/bosh-utils/logger" ) diff --git a/agent/action/ping_test.go b/agent/action/ping_test.go index c3420f574..8012c5f99 100644 --- a/agent/action/ping_test.go +++ b/agent/action/ping_test.go @@ -4,7 +4,7 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/cloudfoundry/bosh-agent/agent/action" + "github.com/cloudfoundry/bosh-agent/v2/agent/action" ) var _ = Describe("Ping", func() { diff --git a/agent/action/prepare.go b/agent/action/prepare.go index fd2a95059..4ebccfa6d 100644 --- a/agent/action/prepare.go +++ b/agent/action/prepare.go @@ -3,8 +3,8 @@ package action import ( "errors" - boshappl "github.com/cloudfoundry/bosh-agent/agent/applier" - boshas "github.com/cloudfoundry/bosh-agent/agent/applier/applyspec" + boshappl "github.com/cloudfoundry/bosh-agent/v2/agent/applier" + boshas "github.com/cloudfoundry/bosh-agent/v2/agent/applier/applyspec" bosherr "github.com/cloudfoundry/bosh-utils/errors" ) diff --git a/agent/action/prepare_configure_networks.go b/agent/action/prepare_configure_networks.go index 126fc1643..8e5b413b6 100644 --- a/agent/action/prepare_configure_networks.go +++ b/agent/action/prepare_configure_networks.go @@ -3,8 +3,8 @@ package action import ( "errors" - boshplatform "github.com/cloudfoundry/bosh-agent/platform" - boshsettings "github.com/cloudfoundry/bosh-agent/settings" + boshplatform "github.com/cloudfoundry/bosh-agent/v2/platform" + boshsettings "github.com/cloudfoundry/bosh-agent/v2/settings" bosherr "github.com/cloudfoundry/bosh-utils/errors" ) diff --git a/agent/action/prepare_configure_networks_test.go b/agent/action/prepare_configure_networks_test.go index 9077de8dc..ed396bd64 100644 --- a/agent/action/prepare_configure_networks_test.go +++ b/agent/action/prepare_configure_networks_test.go @@ -6,9 +6,9 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/cloudfoundry/bosh-agent/agent/action" - "github.com/cloudfoundry/bosh-agent/platform/platformfakes" - fakesettings "github.com/cloudfoundry/bosh-agent/settings/fakes" + "github.com/cloudfoundry/bosh-agent/v2/agent/action" + "github.com/cloudfoundry/bosh-agent/v2/platform/platformfakes" + fakesettings "github.com/cloudfoundry/bosh-agent/v2/settings/fakes" ) var _ = Describe("prepareConfigureNetworks", func() { diff --git a/agent/action/prepare_test.go b/agent/action/prepare_test.go index 95d7e16bd..2987d08d3 100644 --- a/agent/action/prepare_test.go +++ b/agent/action/prepare_test.go @@ -6,9 +6,9 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/cloudfoundry/bosh-agent/agent/action" - boshas "github.com/cloudfoundry/bosh-agent/agent/applier/applyspec" - fakeappl "github.com/cloudfoundry/bosh-agent/agent/applier/fakes" + "github.com/cloudfoundry/bosh-agent/v2/agent/action" + boshas "github.com/cloudfoundry/bosh-agent/v2/agent/applier/applyspec" + fakeappl "github.com/cloudfoundry/bosh-agent/v2/agent/applier/fakes" ) var _ = Describe("PrepareAction", func() { diff --git a/agent/action/release_apply_spec.go b/agent/action/release_apply_spec.go index 1c1e1dc31..7e9e622f9 100644 --- a/agent/action/release_apply_spec.go +++ b/agent/action/release_apply_spec.go @@ -4,7 +4,7 @@ import ( "encoding/json" "errors" - boshplatform "github.com/cloudfoundry/bosh-agent/platform" + boshplatform "github.com/cloudfoundry/bosh-agent/v2/platform" bosherr "github.com/cloudfoundry/bosh-utils/errors" ) diff --git a/agent/action/release_apply_spec_test.go b/agent/action/release_apply_spec_test.go index 89f53d19c..9b7414b12 100644 --- a/agent/action/release_apply_spec_test.go +++ b/agent/action/release_apply_spec_test.go @@ -4,8 +4,8 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/cloudfoundry/bosh-agent/agent/action" - "github.com/cloudfoundry/bosh-agent/platform/platformfakes" + "github.com/cloudfoundry/bosh-agent/v2/agent/action" + "github.com/cloudfoundry/bosh-agent/v2/platform/platformfakes" fakesys "github.com/cloudfoundry/bosh-utils/system/fakes" ) diff --git a/agent/action/remove_file_test.go b/agent/action/remove_file_test.go index b3d848a6f..b1f4ee388 100644 --- a/agent/action/remove_file_test.go +++ b/agent/action/remove_file_test.go @@ -5,7 +5,7 @@ import ( fakesys "github.com/cloudfoundry/bosh-utils/system/fakes" - . "github.com/cloudfoundry/bosh-agent/agent/action" + . "github.com/cloudfoundry/bosh-agent/v2/agent/action" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/agent/action/remove_persistent_disk.go b/agent/action/remove_persistent_disk.go index 3dbf354dd..afe77f798 100644 --- a/agent/action/remove_persistent_disk.go +++ b/agent/action/remove_persistent_disk.go @@ -3,7 +3,7 @@ package action import ( "errors" - boshsettings "github.com/cloudfoundry/bosh-agent/settings" + boshsettings "github.com/cloudfoundry/bosh-agent/v2/settings" bosherr "github.com/cloudfoundry/bosh-utils/errors" ) diff --git a/agent/action/remove_persistent_disk_test.go b/agent/action/remove_persistent_disk_test.go index 74a0bbe3e..93c00fda2 100644 --- a/agent/action/remove_persistent_disk_test.go +++ b/agent/action/remove_persistent_disk_test.go @@ -1,7 +1,7 @@ package action import ( - fakesettings "github.com/cloudfoundry/bosh-agent/settings/fakes" + fakesettings "github.com/cloudfoundry/bosh-agent/v2/settings/fakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/pkg/errors" diff --git a/agent/action/run_errand.go b/agent/action/run_errand.go index ac1e88362..4e2e1dad0 100644 --- a/agent/action/run_errand.go +++ b/agent/action/run_errand.go @@ -5,8 +5,8 @@ import ( "path" "time" - boshas "github.com/cloudfoundry/bosh-agent/agent/applier/applyspec" - "github.com/cloudfoundry/bosh-agent/agent/script/cmd" + boshas "github.com/cloudfoundry/bosh-agent/v2/agent/applier/applyspec" + "github.com/cloudfoundry/bosh-agent/v2/agent/script/cmd" bosherr "github.com/cloudfoundry/bosh-utils/errors" boshlog "github.com/cloudfoundry/bosh-utils/logger" boshsys "github.com/cloudfoundry/bosh-utils/system" diff --git a/agent/action/run_errand_test.go b/agent/action/run_errand_test.go index 426d6c252..2ddee2587 100644 --- a/agent/action/run_errand_test.go +++ b/agent/action/run_errand_test.go @@ -8,10 +8,10 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/cloudfoundry/bosh-agent/agent/action" - boshas "github.com/cloudfoundry/bosh-agent/agent/applier/applyspec" - fakeas "github.com/cloudfoundry/bosh-agent/agent/applier/applyspec/fakes" - boshenv "github.com/cloudfoundry/bosh-agent/agent/script/pathenv" + "github.com/cloudfoundry/bosh-agent/v2/agent/action" + boshas "github.com/cloudfoundry/bosh-agent/v2/agent/applier/applyspec" + fakeas "github.com/cloudfoundry/bosh-agent/v2/agent/applier/applyspec/fakes" + boshenv "github.com/cloudfoundry/bosh-agent/v2/agent/script/pathenv" boshlog "github.com/cloudfoundry/bosh-utils/logger" boshsys "github.com/cloudfoundry/bosh-utils/system" fakesys "github.com/cloudfoundry/bosh-utils/system/fakes" diff --git a/agent/action/run_script.go b/agent/action/run_script.go index 7a398b05d..cfae7d48f 100644 --- a/agent/action/run_script.go +++ b/agent/action/run_script.go @@ -3,8 +3,8 @@ package action import ( "errors" - boshas "github.com/cloudfoundry/bosh-agent/agent/applier/applyspec" - boshscript "github.com/cloudfoundry/bosh-agent/agent/script" + boshas "github.com/cloudfoundry/bosh-agent/v2/agent/applier/applyspec" + boshscript "github.com/cloudfoundry/bosh-agent/v2/agent/script" bosherr "github.com/cloudfoundry/bosh-utils/errors" boshlog "github.com/cloudfoundry/bosh-utils/logger" ) diff --git a/agent/action/run_script_test.go b/agent/action/run_script_test.go index 259550e83..5bc6253d5 100644 --- a/agent/action/run_script_test.go +++ b/agent/action/run_script_test.go @@ -6,11 +6,11 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/cloudfoundry/bosh-agent/agent/action" - "github.com/cloudfoundry/bosh-agent/agent/applier/applyspec" - fakeapplyspec "github.com/cloudfoundry/bosh-agent/agent/applier/applyspec/fakes" - boshscript "github.com/cloudfoundry/bosh-agent/agent/script" - "github.com/cloudfoundry/bosh-agent/agent/script/scriptfakes" + "github.com/cloudfoundry/bosh-agent/v2/agent/action" + "github.com/cloudfoundry/bosh-agent/v2/agent/applier/applyspec" + fakeapplyspec "github.com/cloudfoundry/bosh-agent/v2/agent/applier/applyspec/fakes" + boshscript "github.com/cloudfoundry/bosh-agent/v2/agent/script" + "github.com/cloudfoundry/bosh-agent/v2/agent/script/scriptfakes" boshlog "github.com/cloudfoundry/bosh-utils/logger" ) diff --git a/agent/action/runner_test.go b/agent/action/runner_test.go index a6d12bcbe..f4914ed00 100644 --- a/agent/action/runner_test.go +++ b/agent/action/runner_test.go @@ -6,8 +6,8 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/cloudfoundry/bosh-agent/agent/action" - fakeaction "github.com/cloudfoundry/bosh-agent/agent/action/fakes" + "github.com/cloudfoundry/bosh-agent/v2/agent/action" + fakeaction "github.com/cloudfoundry/bosh-agent/v2/agent/action/fakes" "github.com/stretchr/testify/assert" ) diff --git a/agent/action/shared_test.go b/agent/action/shared_test.go index b110834d0..d1713840a 100644 --- a/agent/action/shared_test.go +++ b/agent/action/shared_test.go @@ -4,7 +4,7 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/cloudfoundry/bosh-agent/agent/action" + "github.com/cloudfoundry/bosh-agent/v2/agent/action" ) func AssertActionIsSynchronousForVersion(a action.Action, version action.ProtocolVersion) { diff --git a/agent/action/shutdown.go b/agent/action/shutdown.go index b432a5bd4..a48e7e99f 100644 --- a/agent/action/shutdown.go +++ b/agent/action/shutdown.go @@ -3,7 +3,7 @@ package action import ( "errors" - "github.com/cloudfoundry/bosh-agent/platform" + "github.com/cloudfoundry/bosh-agent/v2/platform" ) type ShutdownAction struct { diff --git a/agent/action/shutdown_test.go b/agent/action/shutdown_test.go index 6e9e32822..ef4b32533 100644 --- a/agent/action/shutdown_test.go +++ b/agent/action/shutdown_test.go @@ -4,8 +4,8 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/cloudfoundry/bosh-agent/agent/action" - "github.com/cloudfoundry/bosh-agent/platform/platformfakes" + "github.com/cloudfoundry/bosh-agent/v2/agent/action" + "github.com/cloudfoundry/bosh-agent/v2/platform/platformfakes" ) var _ = Describe("Shutdown", func() { diff --git a/agent/action/ssh.go b/agent/action/ssh.go index 638c30fc0..600816430 100644 --- a/agent/action/ssh.go +++ b/agent/action/ssh.go @@ -4,9 +4,9 @@ import ( "errors" "path" - boshplatform "github.com/cloudfoundry/bosh-agent/platform" - boshsettings "github.com/cloudfoundry/bosh-agent/settings" - boshdirs "github.com/cloudfoundry/bosh-agent/settings/directories" + boshplatform "github.com/cloudfoundry/bosh-agent/v2/platform" + boshsettings "github.com/cloudfoundry/bosh-agent/v2/settings" + boshdirs "github.com/cloudfoundry/bosh-agent/v2/settings/directories" bosherr "github.com/cloudfoundry/bosh-utils/errors" boshlog "github.com/cloudfoundry/bosh-utils/logger" ) diff --git a/agent/action/ssh_test.go b/agent/action/ssh_test.go index 2623d4c47..97c5cb028 100644 --- a/agent/action/ssh_test.go +++ b/agent/action/ssh_test.go @@ -6,11 +6,11 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/cloudfoundry/bosh-agent/agent/action" - "github.com/cloudfoundry/bosh-agent/platform/platformfakes" - boshsettings "github.com/cloudfoundry/bosh-agent/settings" - boshdirs "github.com/cloudfoundry/bosh-agent/settings/directories" - fakesettings "github.com/cloudfoundry/bosh-agent/settings/fakes" + "github.com/cloudfoundry/bosh-agent/v2/agent/action" + "github.com/cloudfoundry/bosh-agent/v2/platform/platformfakes" + boshsettings "github.com/cloudfoundry/bosh-agent/v2/settings" + boshdirs "github.com/cloudfoundry/bosh-agent/v2/settings/directories" + fakesettings "github.com/cloudfoundry/bosh-agent/v2/settings/fakes" boshassert "github.com/cloudfoundry/bosh-utils/assert" boshlog "github.com/cloudfoundry/bosh-utils/logger" ) diff --git a/agent/action/start.go b/agent/action/start.go index 760e14473..a97b658d7 100644 --- a/agent/action/start.go +++ b/agent/action/start.go @@ -3,9 +3,9 @@ package action import ( "errors" - boshappl "github.com/cloudfoundry/bosh-agent/agent/applier" - boshas "github.com/cloudfoundry/bosh-agent/agent/applier/applyspec" - boshjobsuper "github.com/cloudfoundry/bosh-agent/jobsupervisor" + boshappl "github.com/cloudfoundry/bosh-agent/v2/agent/applier" + boshas "github.com/cloudfoundry/bosh-agent/v2/agent/applier/applyspec" + boshjobsuper "github.com/cloudfoundry/bosh-agent/v2/jobsupervisor" bosherr "github.com/cloudfoundry/bosh-utils/errors" ) diff --git a/agent/action/start_test.go b/agent/action/start_test.go index 8f8d13475..0b294a48d 100644 --- a/agent/action/start_test.go +++ b/agent/action/start_test.go @@ -6,10 +6,10 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/cloudfoundry/bosh-agent/agent/action" - fakeas "github.com/cloudfoundry/bosh-agent/agent/applier/applyspec/fakes" - fakeappl "github.com/cloudfoundry/bosh-agent/agent/applier/fakes" - fakejobsuper "github.com/cloudfoundry/bosh-agent/jobsupervisor/fakes" + "github.com/cloudfoundry/bosh-agent/v2/agent/action" + fakeas "github.com/cloudfoundry/bosh-agent/v2/agent/applier/applyspec/fakes" + fakeappl "github.com/cloudfoundry/bosh-agent/v2/agent/applier/fakes" + fakejobsuper "github.com/cloudfoundry/bosh-agent/v2/jobsupervisor/fakes" ) var _ = Describe("Start", func() { diff --git a/agent/action/state/sync_dns_state.go b/agent/action/state/sync_dns_state.go index 50db1ea35..0deef9111 100644 --- a/agent/action/state/sync_dns_state.go +++ b/agent/action/state/sync_dns_state.go @@ -3,7 +3,7 @@ package state import ( "encoding/json" - boshplatform "github.com/cloudfoundry/bosh-agent/platform" + boshplatform "github.com/cloudfoundry/bosh-agent/v2/platform" bosherr "github.com/cloudfoundry/bosh-utils/errors" boshsys "github.com/cloudfoundry/bosh-utils/system" boshuuid "github.com/cloudfoundry/bosh-utils/uuid" diff --git a/agent/action/state/sync_dns_state_test.go b/agent/action/state/sync_dns_state_test.go index 25167989a..b0648c48e 100644 --- a/agent/action/state/sync_dns_state_test.go +++ b/agent/action/state/sync_dns_state_test.go @@ -6,8 +6,8 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/cloudfoundry/bosh-agent/agent/action/state" - "github.com/cloudfoundry/bosh-agent/platform/platformfakes" + "github.com/cloudfoundry/bosh-agent/v2/agent/action/state" + "github.com/cloudfoundry/bosh-agent/v2/platform/platformfakes" fakesys "github.com/cloudfoundry/bosh-utils/system/fakes" fakeuuidgen "github.com/cloudfoundry/bosh-utils/uuid/fakes" ) diff --git a/agent/action/stop.go b/agent/action/stop.go index 1a349cdbf..b962c8a19 100644 --- a/agent/action/stop.go +++ b/agent/action/stop.go @@ -3,7 +3,7 @@ package action import ( "errors" - boshjobsuper "github.com/cloudfoundry/bosh-agent/jobsupervisor" + boshjobsuper "github.com/cloudfoundry/bosh-agent/v2/jobsupervisor" bosherr "github.com/cloudfoundry/bosh-utils/errors" ) diff --git a/agent/action/stop_test.go b/agent/action/stop_test.go index 8642a36ba..a17780f52 100644 --- a/agent/action/stop_test.go +++ b/agent/action/stop_test.go @@ -4,8 +4,8 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/cloudfoundry/bosh-agent/agent/action" - fakejobsuper "github.com/cloudfoundry/bosh-agent/jobsupervisor/fakes" + "github.com/cloudfoundry/bosh-agent/v2/agent/action" + fakejobsuper "github.com/cloudfoundry/bosh-agent/v2/jobsupervisor/fakes" ) var _ = Describe("Stop", func() { diff --git a/agent/action/sync_dns.go b/agent/action/sync_dns.go index 8b732675a..b1d8a232b 100644 --- a/agent/action/sync_dns.go +++ b/agent/action/sync_dns.go @@ -7,11 +7,11 @@ import ( "path/filepath" "sync" - "github.com/cloudfoundry/bosh-agent/agent/action/state" - "github.com/cloudfoundry/bosh-agent/agent/httpblobprovider/blobstore_delegator" + "github.com/cloudfoundry/bosh-agent/v2/agent/action/state" + "github.com/cloudfoundry/bosh-agent/v2/agent/httpblobprovider/blobstore_delegator" - boshplat "github.com/cloudfoundry/bosh-agent/platform" - boshsettings "github.com/cloudfoundry/bosh-agent/settings" + boshplat "github.com/cloudfoundry/bosh-agent/v2/platform" + boshsettings "github.com/cloudfoundry/bosh-agent/v2/settings" boshcrypto "github.com/cloudfoundry/bosh-utils/crypto" bosherr "github.com/cloudfoundry/bosh-utils/errors" boshlog "github.com/cloudfoundry/bosh-utils/logger" diff --git a/agent/action/sync_dns_test.go b/agent/action/sync_dns_test.go index 2edf2fb82..1b9317aac 100644 --- a/agent/action/sync_dns_test.go +++ b/agent/action/sync_dns_test.go @@ -7,11 +7,11 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/cloudfoundry/bosh-agent/agent/action" - fakeblobdelegator "github.com/cloudfoundry/bosh-agent/agent/httpblobprovider/blobstore_delegator/blobstore_delegatorfakes" - "github.com/cloudfoundry/bosh-agent/platform/platformfakes" - boshsettings "github.com/cloudfoundry/bosh-agent/settings" - fakesettings "github.com/cloudfoundry/bosh-agent/settings/fakes" + "github.com/cloudfoundry/bosh-agent/v2/agent/action" + fakeblobdelegator "github.com/cloudfoundry/bosh-agent/v2/agent/httpblobprovider/blobstore_delegator/blobstore_delegatorfakes" + "github.com/cloudfoundry/bosh-agent/v2/platform/platformfakes" + boshsettings "github.com/cloudfoundry/bosh-agent/v2/settings" + fakesettings "github.com/cloudfoundry/bosh-agent/v2/settings/fakes" boshcrypto "github.com/cloudfoundry/bosh-utils/crypto" fakelogger "github.com/cloudfoundry/bosh-utils/logger/loggerfakes" fakesys "github.com/cloudfoundry/bosh-utils/system/fakes" diff --git a/agent/action/sync_dns_with_signed_url.go b/agent/action/sync_dns_with_signed_url.go index 5075bb748..41679337d 100644 --- a/agent/action/sync_dns_with_signed_url.go +++ b/agent/action/sync_dns_with_signed_url.go @@ -7,10 +7,10 @@ import ( "path/filepath" "sync" - "github.com/cloudfoundry/bosh-agent/agent/action/state" - blobdelegator "github.com/cloudfoundry/bosh-agent/agent/httpblobprovider/blobstore_delegator" - boshplat "github.com/cloudfoundry/bosh-agent/platform" - boshsettings "github.com/cloudfoundry/bosh-agent/settings" + "github.com/cloudfoundry/bosh-agent/v2/agent/action/state" + blobdelegator "github.com/cloudfoundry/bosh-agent/v2/agent/httpblobprovider/blobstore_delegator" + boshplat "github.com/cloudfoundry/bosh-agent/v2/platform" + boshsettings "github.com/cloudfoundry/bosh-agent/v2/settings" boshcrypto "github.com/cloudfoundry/bosh-utils/crypto" bosherr "github.com/cloudfoundry/bosh-utils/errors" boshlog "github.com/cloudfoundry/bosh-utils/logger" diff --git a/agent/action/sync_dns_with_signed_url_test.go b/agent/action/sync_dns_with_signed_url_test.go index 9f0e7d4fe..b935e4212 100644 --- a/agent/action/sync_dns_with_signed_url_test.go +++ b/agent/action/sync_dns_with_signed_url_test.go @@ -7,14 +7,14 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/cloudfoundry/bosh-agent/agent/action" - fakeblobdelegator "github.com/cloudfoundry/bosh-agent/agent/httpblobprovider/blobstore_delegator/blobstore_delegatorfakes" - "github.com/cloudfoundry/bosh-agent/platform/platformfakes" - fakesettings "github.com/cloudfoundry/bosh-agent/settings/fakes" + "github.com/cloudfoundry/bosh-agent/v2/agent/action" + fakeblobdelegator "github.com/cloudfoundry/bosh-agent/v2/agent/httpblobprovider/blobstore_delegator/blobstore_delegatorfakes" + "github.com/cloudfoundry/bosh-agent/v2/platform/platformfakes" + fakesettings "github.com/cloudfoundry/bosh-agent/v2/settings/fakes" fakelogger "github.com/cloudfoundry/bosh-utils/logger/loggerfakes" fakesys "github.com/cloudfoundry/bosh-utils/system/fakes" - boshsettings "github.com/cloudfoundry/bosh-agent/settings" + boshsettings "github.com/cloudfoundry/bosh-agent/v2/settings" boshcrypto "github.com/cloudfoundry/bosh-utils/crypto" ) diff --git a/agent/action/unmount_disk.go b/agent/action/unmount_disk.go index bd3a6857d..2191ad17e 100644 --- a/agent/action/unmount_disk.go +++ b/agent/action/unmount_disk.go @@ -4,8 +4,8 @@ import ( "errors" "fmt" - boshplatform "github.com/cloudfoundry/bosh-agent/platform" - boshsettings "github.com/cloudfoundry/bosh-agent/settings" + boshplatform "github.com/cloudfoundry/bosh-agent/v2/platform" + boshsettings "github.com/cloudfoundry/bosh-agent/v2/settings" bosherr "github.com/cloudfoundry/bosh-utils/errors" ) diff --git a/agent/action/unmount_disk_test.go b/agent/action/unmount_disk_test.go index c0ef2c147..fc544a532 100644 --- a/agent/action/unmount_disk_test.go +++ b/agent/action/unmount_disk_test.go @@ -6,11 +6,11 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/cloudfoundry/bosh-agent/agent/action" - "github.com/cloudfoundry/bosh-agent/platform/disk" - "github.com/cloudfoundry/bosh-agent/platform/platformfakes" - boshsettings "github.com/cloudfoundry/bosh-agent/settings" - fakesettings "github.com/cloudfoundry/bosh-agent/settings/fakes" + "github.com/cloudfoundry/bosh-agent/v2/agent/action" + "github.com/cloudfoundry/bosh-agent/v2/platform/disk" + "github.com/cloudfoundry/bosh-agent/v2/platform/platformfakes" + boshsettings "github.com/cloudfoundry/bosh-agent/v2/settings" + fakesettings "github.com/cloudfoundry/bosh-agent/v2/settings/fakes" boshassert "github.com/cloudfoundry/bosh-utils/assert" ) diff --git a/agent/action/update_settings.go b/agent/action/update_settings.go index ecb51a205..1e4cbe1e7 100644 --- a/agent/action/update_settings.go +++ b/agent/action/update_settings.go @@ -3,10 +3,10 @@ package action import ( "errors" - "github.com/cloudfoundry/bosh-agent/agent/utils" - "github.com/cloudfoundry/bosh-agent/platform" - "github.com/cloudfoundry/bosh-agent/platform/cert" - boshsettings "github.com/cloudfoundry/bosh-agent/settings" + "github.com/cloudfoundry/bosh-agent/v2/agent/utils" + "github.com/cloudfoundry/bosh-agent/v2/platform" + "github.com/cloudfoundry/bosh-agent/v2/platform/cert" + boshsettings "github.com/cloudfoundry/bosh-agent/v2/settings" bosherr "github.com/cloudfoundry/bosh-utils/errors" "github.com/cloudfoundry/bosh-utils/logger" ) diff --git a/agent/action/update_settings_test.go b/agent/action/update_settings_test.go index c5951c5fd..6f6e1ba21 100644 --- a/agent/action/update_settings_test.go +++ b/agent/action/update_settings_test.go @@ -6,12 +6,12 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/cloudfoundry/bosh-agent/agent/action" - "github.com/cloudfoundry/bosh-agent/agent/utils/utilsfakes" - "github.com/cloudfoundry/bosh-agent/platform/cert/certfakes" - "github.com/cloudfoundry/bosh-agent/platform/platformfakes" - boshsettings "github.com/cloudfoundry/bosh-agent/settings" - fakesettings "github.com/cloudfoundry/bosh-agent/settings/fakes" + "github.com/cloudfoundry/bosh-agent/v2/agent/action" + "github.com/cloudfoundry/bosh-agent/v2/agent/utils/utilsfakes" + "github.com/cloudfoundry/bosh-agent/v2/platform/cert/certfakes" + "github.com/cloudfoundry/bosh-agent/v2/platform/platformfakes" + boshsettings "github.com/cloudfoundry/bosh-agent/v2/settings" + fakesettings "github.com/cloudfoundry/bosh-agent/v2/settings/fakes" "github.com/cloudfoundry/bosh-utils/logger" fakesys "github.com/cloudfoundry/bosh-utils/system/fakes" ) diff --git a/agent/action/upload_blob.go b/agent/action/upload_blob.go index 3852a193c..be92ac67b 100644 --- a/agent/action/upload_blob.go +++ b/agent/action/upload_blob.go @@ -5,7 +5,7 @@ import ( "encoding/base64" "errors" - boshagentblobstore "github.com/cloudfoundry/bosh-agent/agent/blobstore" + boshagentblobstore "github.com/cloudfoundry/bosh-agent/v2/agent/blobstore" boshcrypto "github.com/cloudfoundry/bosh-utils/crypto" bosherr "github.com/cloudfoundry/bosh-utils/errors" diff --git a/agent/action/upload_blob_test.go b/agent/action/upload_blob_test.go index 4e5b734cc..1378136b0 100644 --- a/agent/action/upload_blob_test.go +++ b/agent/action/upload_blob_test.go @@ -6,8 +6,8 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/cloudfoundry/bosh-agent/agent/action" - "github.com/cloudfoundry/bosh-agent/agent/blobstore/blobstorefakes" + "github.com/cloudfoundry/bosh-agent/v2/agent/action" + "github.com/cloudfoundry/bosh-agent/v2/agent/blobstore/blobstorefakes" "github.com/cloudfoundry/bosh-utils/crypto" ) diff --git a/agent/action_dispatcher.go b/agent/action_dispatcher.go index 4f1cea749..f1e1b387c 100644 --- a/agent/action_dispatcher.go +++ b/agent/action_dispatcher.go @@ -1,9 +1,9 @@ package agent import ( - boshaction "github.com/cloudfoundry/bosh-agent/agent/action" - boshtask "github.com/cloudfoundry/bosh-agent/agent/task" - boshhandler "github.com/cloudfoundry/bosh-agent/handler" + boshaction "github.com/cloudfoundry/bosh-agent/v2/agent/action" + boshtask "github.com/cloudfoundry/bosh-agent/v2/agent/task" + boshhandler "github.com/cloudfoundry/bosh-agent/v2/handler" bosherr "github.com/cloudfoundry/bosh-utils/errors" boshlog "github.com/cloudfoundry/bosh-utils/logger" ) diff --git a/agent/action_dispatcher_test.go b/agent/action_dispatcher_test.go index 57dcd63f9..7fdb392b6 100644 --- a/agent/action_dispatcher_test.go +++ b/agent/action_dispatcher_test.go @@ -8,12 +8,12 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/cloudfoundry/bosh-agent/agent" - "github.com/cloudfoundry/bosh-agent/agent/action" - fakeaction "github.com/cloudfoundry/bosh-agent/agent/action/fakes" - boshtask "github.com/cloudfoundry/bosh-agent/agent/task" - faketask "github.com/cloudfoundry/bosh-agent/agent/task/fakes" - boshhandler "github.com/cloudfoundry/bosh-agent/handler" + "github.com/cloudfoundry/bosh-agent/v2/agent" + "github.com/cloudfoundry/bosh-agent/v2/agent/action" + fakeaction "github.com/cloudfoundry/bosh-agent/v2/agent/action/fakes" + boshtask "github.com/cloudfoundry/bosh-agent/v2/agent/task" + faketask "github.com/cloudfoundry/bosh-agent/v2/agent/task/fakes" + boshhandler "github.com/cloudfoundry/bosh-agent/v2/handler" boshassert "github.com/cloudfoundry/bosh-utils/assert" fakes "github.com/cloudfoundry/bosh-utils/logger/loggerfakes" ) diff --git a/agent/agent.go b/agent/agent.go index 960a9afde..86dc7f5c1 100644 --- a/agent/agent.go +++ b/agent/agent.go @@ -5,12 +5,12 @@ import ( "code.cloudfoundry.org/clock" - boshalert "github.com/cloudfoundry/bosh-agent/agent/alert" - boshas "github.com/cloudfoundry/bosh-agent/agent/applier/applyspec" - boshhandler "github.com/cloudfoundry/bosh-agent/handler" - boshjobsuper "github.com/cloudfoundry/bosh-agent/jobsupervisor" - boshplatform "github.com/cloudfoundry/bosh-agent/platform" - boshsettings "github.com/cloudfoundry/bosh-agent/settings" + boshalert "github.com/cloudfoundry/bosh-agent/v2/agent/alert" + boshas "github.com/cloudfoundry/bosh-agent/v2/agent/applier/applyspec" + boshhandler "github.com/cloudfoundry/bosh-agent/v2/handler" + boshjobsuper "github.com/cloudfoundry/bosh-agent/v2/jobsupervisor" + boshplatform "github.com/cloudfoundry/bosh-agent/v2/platform" + boshsettings "github.com/cloudfoundry/bosh-agent/v2/settings" bosherr "github.com/cloudfoundry/bosh-utils/errors" boshlog "github.com/cloudfoundry/bosh-utils/logger" boshretry "github.com/cloudfoundry/bosh-utils/retrystrategy" diff --git a/agent/agent_suite_test.go b/agent/agent_suite_test.go index 217539c6f..a15fce369 100644 --- a/agent/agent_suite_test.go +++ b/agent/agent_suite_test.go @@ -3,7 +3,7 @@ package agent_test import ( "time" - "github.com/cloudfoundry/bosh-agent/agent" + "github.com/cloudfoundry/bosh-agent/v2/agent" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/agent/agent_test.go b/agent/agent_test.go index 6f5fa59a0..60178a3c0 100644 --- a/agent/agent_test.go +++ b/agent/agent_test.go @@ -8,19 +8,19 @@ import ( . "github.com/onsi/gomega" "code.cloudfoundry.org/clock/fakeclock" - "github.com/cloudfoundry/bosh-agent/agent" - "github.com/cloudfoundry/bosh-agent/agent/agentfakes" - boshalert "github.com/cloudfoundry/bosh-agent/agent/alert" - boshas "github.com/cloudfoundry/bosh-agent/agent/applier/applyspec" - fakeas "github.com/cloudfoundry/bosh-agent/agent/applier/applyspec/fakes" - fakeagent "github.com/cloudfoundry/bosh-agent/agent/fakes" - boshhandler "github.com/cloudfoundry/bosh-agent/handler" - fakejobsuper "github.com/cloudfoundry/bosh-agent/jobsupervisor/fakes" - fakembus "github.com/cloudfoundry/bosh-agent/mbus/fakes" - "github.com/cloudfoundry/bosh-agent/platform/platformfakes" - boshvitals "github.com/cloudfoundry/bosh-agent/platform/vitals" - "github.com/cloudfoundry/bosh-agent/platform/vitals/vitalsfakes" - fakesettings "github.com/cloudfoundry/bosh-agent/settings/fakes" + "github.com/cloudfoundry/bosh-agent/v2/agent" + "github.com/cloudfoundry/bosh-agent/v2/agent/agentfakes" + boshalert "github.com/cloudfoundry/bosh-agent/v2/agent/alert" + boshas "github.com/cloudfoundry/bosh-agent/v2/agent/applier/applyspec" + fakeas "github.com/cloudfoundry/bosh-agent/v2/agent/applier/applyspec/fakes" + fakeagent "github.com/cloudfoundry/bosh-agent/v2/agent/fakes" + boshhandler "github.com/cloudfoundry/bosh-agent/v2/handler" + fakejobsuper "github.com/cloudfoundry/bosh-agent/v2/jobsupervisor/fakes" + fakembus "github.com/cloudfoundry/bosh-agent/v2/mbus/fakes" + "github.com/cloudfoundry/bosh-agent/v2/platform/platformfakes" + boshvitals "github.com/cloudfoundry/bosh-agent/v2/platform/vitals" + "github.com/cloudfoundry/bosh-agent/v2/platform/vitals/vitalsfakes" + fakesettings "github.com/cloudfoundry/bosh-agent/v2/settings/fakes" boshlog "github.com/cloudfoundry/bosh-utils/logger" fakeuuid "github.com/cloudfoundry/bosh-utils/uuid/fakes" ) diff --git a/agent/agentfakes/fake_start_manager.go b/agent/agentfakes/fake_start_manager.go index 65a2716ba..6a0add9de 100644 --- a/agent/agentfakes/fake_start_manager.go +++ b/agent/agentfakes/fake_start_manager.go @@ -4,7 +4,7 @@ package agentfakes import ( "sync" - "github.com/cloudfoundry/bosh-agent/agent" + "github.com/cloudfoundry/bosh-agent/v2/agent" ) type FakeStartManager struct { diff --git a/agent/alert/monit_adapter.go b/agent/alert/monit_adapter.go index 55767974a..ecaab23e8 100644 --- a/agent/alert/monit_adapter.go +++ b/agent/alert/monit_adapter.go @@ -7,7 +7,7 @@ import ( "time" "code.cloudfoundry.org/clock" - boshsettings "github.com/cloudfoundry/bosh-agent/settings" + boshsettings "github.com/cloudfoundry/bosh-agent/v2/settings" ) type MonitAdapter interface { diff --git a/agent/alert/monit_adapter_test.go b/agent/alert/monit_adapter_test.go index e26609473..0690b871d 100644 --- a/agent/alert/monit_adapter_test.go +++ b/agent/alert/monit_adapter_test.go @@ -7,10 +7,10 @@ import ( . "github.com/onsi/gomega" "code.cloudfoundry.org/clock/fakeclock" - . "github.com/cloudfoundry/bosh-agent/agent/alert" - fakesettings "github.com/cloudfoundry/bosh-agent/settings/fakes" + . "github.com/cloudfoundry/bosh-agent/v2/agent/alert" + fakesettings "github.com/cloudfoundry/bosh-agent/v2/settings/fakes" - boshsettings "github.com/cloudfoundry/bosh-agent/settings" + boshsettings "github.com/cloudfoundry/bosh-agent/v2/settings" ) func buildMonitAlert() MonitAlert { diff --git a/agent/applier/applier_interface.go b/agent/applier/applier_interface.go index c98f3a90c..6e88120f7 100644 --- a/agent/applier/applier_interface.go +++ b/agent/applier/applier_interface.go @@ -1,7 +1,7 @@ package applier import ( - boshas "github.com/cloudfoundry/bosh-agent/agent/applier/applyspec" + boshas "github.com/cloudfoundry/bosh-agent/v2/agent/applier/applyspec" ) type Applier interface { diff --git a/agent/applier/applyspec/apply_spec_interface.go b/agent/applier/applyspec/apply_spec_interface.go index 27d2a0869..9aa85a7b7 100644 --- a/agent/applier/applyspec/apply_spec_interface.go +++ b/agent/applier/applyspec/apply_spec_interface.go @@ -1,7 +1,7 @@ package applyspec import ( - models "github.com/cloudfoundry/bosh-agent/agent/applier/models" + models "github.com/cloudfoundry/bosh-agent/v2/agent/applier/models" ) type ApplySpec interface { diff --git a/agent/applier/applyspec/concrete_v1_service.go b/agent/applier/applyspec/concrete_v1_service.go index b146da1dd..1e5ef45c1 100644 --- a/agent/applier/applyspec/concrete_v1_service.go +++ b/agent/applier/applyspec/concrete_v1_service.go @@ -3,7 +3,7 @@ package applyspec import ( "encoding/json" - boshsettings "github.com/cloudfoundry/bosh-agent/settings" + boshsettings "github.com/cloudfoundry/bosh-agent/v2/settings" bosherr "github.com/cloudfoundry/bosh-utils/errors" boshsys "github.com/cloudfoundry/bosh-utils/system" ) diff --git a/agent/applier/applyspec/concrete_v1_service_test.go b/agent/applier/applyspec/concrete_v1_service_test.go index 61666e055..249152027 100644 --- a/agent/applier/applyspec/concrete_v1_service_test.go +++ b/agent/applier/applyspec/concrete_v1_service_test.go @@ -6,8 +6,8 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/cloudfoundry/bosh-agent/agent/applier/applyspec" - boshsettings "github.com/cloudfoundry/bosh-agent/settings" + . "github.com/cloudfoundry/bosh-agent/v2/agent/applier/applyspec" + boshsettings "github.com/cloudfoundry/bosh-agent/v2/settings" boshassert "github.com/cloudfoundry/bosh-utils/assert" fakesys "github.com/cloudfoundry/bosh-utils/system/fakes" ) diff --git a/agent/applier/applyspec/fakes/fake_apply_spec.go b/agent/applier/applyspec/fakes/fake_apply_spec.go index 501bd61e6..91e1c046d 100644 --- a/agent/applier/applyspec/fakes/fake_apply_spec.go +++ b/agent/applier/applyspec/fakes/fake_apply_spec.go @@ -1,7 +1,7 @@ package fakes import ( - models "github.com/cloudfoundry/bosh-agent/agent/applier/models" + models "github.com/cloudfoundry/bosh-agent/v2/agent/applier/models" ) type FakeApplySpec struct { diff --git a/agent/applier/applyspec/fakes/fake_v1_service.go b/agent/applier/applyspec/fakes/fake_v1_service.go index d182fa936..8af307b53 100644 --- a/agent/applier/applyspec/fakes/fake_v1_service.go +++ b/agent/applier/applyspec/fakes/fake_v1_service.go @@ -1,8 +1,8 @@ package fakes import ( - boshas "github.com/cloudfoundry/bosh-agent/agent/applier/applyspec" - boshsettings "github.com/cloudfoundry/bosh-agent/settings" + boshas "github.com/cloudfoundry/bosh-agent/v2/agent/applier/applyspec" + boshsettings "github.com/cloudfoundry/bosh-agent/v2/settings" ) type FakeV1Service struct { diff --git a/agent/applier/applyspec/job_spec.go b/agent/applier/applyspec/job_spec.go index 34c2d1e2b..ce44d5ec9 100644 --- a/agent/applier/applyspec/job_spec.go +++ b/agent/applier/applyspec/job_spec.go @@ -1,7 +1,7 @@ package applyspec import ( - models "github.com/cloudfoundry/bosh-agent/agent/applier/models" + models "github.com/cloudfoundry/bosh-agent/v2/agent/applier/models" ) type JobSpec struct { diff --git a/agent/applier/applyspec/job_template_spec.go b/agent/applier/applyspec/job_template_spec.go index 64e43530a..936c5e861 100644 --- a/agent/applier/applyspec/job_template_spec.go +++ b/agent/applier/applyspec/job_template_spec.go @@ -1,7 +1,7 @@ package applyspec import ( - models "github.com/cloudfoundry/bosh-agent/agent/applier/models" + models "github.com/cloudfoundry/bosh-agent/v2/agent/applier/models" ) type JobTemplateSpec struct { diff --git a/agent/applier/applyspec/package_spec.go b/agent/applier/applyspec/package_spec.go index 826865ada..867511160 100644 --- a/agent/applier/applyspec/package_spec.go +++ b/agent/applier/applyspec/package_spec.go @@ -1,7 +1,7 @@ package applyspec import ( - models "github.com/cloudfoundry/bosh-agent/agent/applier/models" + models "github.com/cloudfoundry/bosh-agent/v2/agent/applier/models" "github.com/cloudfoundry/bosh-utils/crypto" ) diff --git a/agent/applier/applyspec/rendered_templates_archive_spec.go b/agent/applier/applyspec/rendered_templates_archive_spec.go index c4eb79050..1f99cd074 100644 --- a/agent/applier/applyspec/rendered_templates_archive_spec.go +++ b/agent/applier/applyspec/rendered_templates_archive_spec.go @@ -1,7 +1,7 @@ package applyspec import ( - "github.com/cloudfoundry/bosh-agent/agent/applier/models" + "github.com/cloudfoundry/bosh-agent/v2/agent/applier/models" "github.com/cloudfoundry/bosh-utils/crypto" "encoding/json" diff --git a/agent/applier/applyspec/rendered_templates_archive_spec_test.go b/agent/applier/applyspec/rendered_templates_archive_spec_test.go index 72dd4025c..0f6856f93 100644 --- a/agent/applier/applyspec/rendered_templates_archive_spec_test.go +++ b/agent/applier/applyspec/rendered_templates_archive_spec_test.go @@ -8,8 +8,8 @@ import ( "encoding/json" - . "github.com/cloudfoundry/bosh-agent/agent/applier/applyspec" - "github.com/cloudfoundry/bosh-agent/agent/applier/models" + . "github.com/cloudfoundry/bosh-agent/v2/agent/applier/applyspec" + "github.com/cloudfoundry/bosh-agent/v2/agent/applier/models" boshcrypto "github.com/cloudfoundry/bosh-utils/crypto" ) diff --git a/agent/applier/applyspec/service_interface.go b/agent/applier/applyspec/service_interface.go index 3b6aebd7d..2c47a1e21 100644 --- a/agent/applier/applyspec/service_interface.go +++ b/agent/applier/applyspec/service_interface.go @@ -1,7 +1,7 @@ package applyspec import ( - boshsettings "github.com/cloudfoundry/bosh-agent/settings" + boshsettings "github.com/cloudfoundry/bosh-agent/v2/settings" ) type V1Service interface { diff --git a/agent/applier/applyspec/v1_apply_spec.go b/agent/applier/applyspec/v1_apply_spec.go index 4989f2b3a..bb5f10226 100644 --- a/agent/applier/applyspec/v1_apply_spec.go +++ b/agent/applier/applyspec/v1_apply_spec.go @@ -3,7 +3,7 @@ package applyspec import ( "encoding/json" - "github.com/cloudfoundry/bosh-agent/agent/applier/models" + "github.com/cloudfoundry/bosh-agent/v2/agent/applier/models" ) type V1ApplySpec struct { diff --git a/agent/applier/applyspec/v1_apply_spec_test.go b/agent/applier/applyspec/v1_apply_spec_test.go index 27b190a6d..c89c166ee 100644 --- a/agent/applier/applyspec/v1_apply_spec_test.go +++ b/agent/applier/applyspec/v1_apply_spec_test.go @@ -6,8 +6,8 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/cloudfoundry/bosh-agent/agent/applier/applyspec" - models "github.com/cloudfoundry/bosh-agent/agent/applier/models" + . "github.com/cloudfoundry/bosh-agent/v2/agent/applier/applyspec" + models "github.com/cloudfoundry/bosh-agent/v2/agent/applier/models" "github.com/cloudfoundry/bosh-utils/crypto" ) diff --git a/agent/applier/bundlecollection/fakes/fake_bundle_collection.go b/agent/applier/bundlecollection/fakes/fake_bundle_collection.go index 91818c771..a3a7c2237 100644 --- a/agent/applier/bundlecollection/fakes/fake_bundle_collection.go +++ b/agent/applier/bundlecollection/fakes/fake_bundle_collection.go @@ -3,7 +3,7 @@ package fakes import ( "errors" - bc "github.com/cloudfoundry/bosh-agent/agent/applier/bundlecollection" + bc "github.com/cloudfoundry/bosh-agent/v2/agent/applier/bundlecollection" ) type FakeBundleCollection struct { diff --git a/agent/applier/bundlecollection/file_bundle.go b/agent/applier/bundlecollection/file_bundle.go index 293468eb7..bfb1bfdc2 100644 --- a/agent/applier/bundlecollection/file_bundle.go +++ b/agent/applier/bundlecollection/file_bundle.go @@ -6,7 +6,7 @@ import ( "path/filepath" "code.cloudfoundry.org/clock" - "github.com/cloudfoundry/bosh-agent/agent/tarpath" + "github.com/cloudfoundry/bosh-agent/v2/agent/tarpath" bosherr "github.com/cloudfoundry/bosh-utils/errors" "github.com/cloudfoundry/bosh-utils/fileutil" boshlog "github.com/cloudfoundry/bosh-utils/logger" diff --git a/agent/applier/bundlecollection/file_bundle_collection.go b/agent/applier/bundlecollection/file_bundle_collection.go index 97fe80097..912a1c8cc 100644 --- a/agent/applier/bundlecollection/file_bundle_collection.go +++ b/agent/applier/bundlecollection/file_bundle_collection.go @@ -8,7 +8,7 @@ import ( "os" "code.cloudfoundry.org/clock" - "github.com/cloudfoundry/bosh-agent/agent/tarpath" + "github.com/cloudfoundry/bosh-agent/v2/agent/tarpath" boshcrypto "github.com/cloudfoundry/bosh-utils/crypto" bosherr "github.com/cloudfoundry/bosh-utils/errors" "github.com/cloudfoundry/bosh-utils/fileutil" diff --git a/agent/applier/bundlecollection/file_bundle_collection_test.go b/agent/applier/bundlecollection/file_bundle_collection_test.go index 5c8d828e9..cecfbe29c 100644 --- a/agent/applier/bundlecollection/file_bundle_collection_test.go +++ b/agent/applier/bundlecollection/file_bundle_collection_test.go @@ -3,14 +3,14 @@ package bundlecollection_test import ( "errors" - . "github.com/cloudfoundry/bosh-agent/agent/applier/bundlecollection" - "github.com/cloudfoundry/bosh-agent/agent/tarpath" + . "github.com/cloudfoundry/bosh-agent/v2/agent/applier/bundlecollection" + "github.com/cloudfoundry/bosh-agent/v2/agent/tarpath" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "os" - "github.com/cloudfoundry/bosh-agent/agent/applier/bundlecollection/fakes" + "github.com/cloudfoundry/bosh-agent/v2/agent/applier/bundlecollection/fakes" fakefileutil "github.com/cloudfoundry/bosh-utils/fileutil/fakes" boshlog "github.com/cloudfoundry/bosh-utils/logger" fakesys "github.com/cloudfoundry/bosh-utils/system/fakes" diff --git a/agent/applier/bundlecollection/file_bundle_collection_windows_test.go b/agent/applier/bundlecollection/file_bundle_collection_windows_test.go index c8731c8ae..460e065eb 100644 --- a/agent/applier/bundlecollection/file_bundle_collection_windows_test.go +++ b/agent/applier/bundlecollection/file_bundle_collection_windows_test.go @@ -8,9 +8,9 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/cloudfoundry/bosh-agent/agent/applier/bundlecollection" - "github.com/cloudfoundry/bosh-agent/agent/applier/bundlecollection/fakes" - "github.com/cloudfoundry/bosh-agent/agent/tarpath" + . "github.com/cloudfoundry/bosh-agent/v2/agent/applier/bundlecollection" + "github.com/cloudfoundry/bosh-agent/v2/agent/applier/bundlecollection/fakes" + "github.com/cloudfoundry/bosh-agent/v2/agent/tarpath" fakefileutil "github.com/cloudfoundry/bosh-utils/fileutil/fakes" boshlog "github.com/cloudfoundry/bosh-utils/logger" fakesys "github.com/cloudfoundry/bosh-utils/system/fakes" diff --git a/agent/applier/bundlecollection/file_bundle_setup_unix_test.go b/agent/applier/bundlecollection/file_bundle_setup_unix_test.go index 683b5e683..e63daa140 100644 --- a/agent/applier/bundlecollection/file_bundle_setup_unix_test.go +++ b/agent/applier/bundlecollection/file_bundle_setup_unix_test.go @@ -10,13 +10,13 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/cloudfoundry/bosh-agent/agent/action/fakes" - "github.com/cloudfoundry/bosh-agent/agent/tarpath/tarpathfakes" + "github.com/cloudfoundry/bosh-agent/v2/agent/action/fakes" + "github.com/cloudfoundry/bosh-agent/v2/agent/tarpath/tarpathfakes" fakefileutil "github.com/cloudfoundry/bosh-utils/fileutil/fakes" boshlog "github.com/cloudfoundry/bosh-utils/logger" fakesys "github.com/cloudfoundry/bosh-utils/system/fakes" - . "github.com/cloudfoundry/bosh-agent/agent/applier/bundlecollection" + . "github.com/cloudfoundry/bosh-agent/v2/agent/applier/bundlecollection" ) var _ = Describe("FileBundle", func() { diff --git a/agent/applier/bundlecollection/file_bundle_setup_windows_test.go b/agent/applier/bundlecollection/file_bundle_setup_windows_test.go index 332b4aa28..a1d8b76cc 100644 --- a/agent/applier/bundlecollection/file_bundle_setup_windows_test.go +++ b/agent/applier/bundlecollection/file_bundle_setup_windows_test.go @@ -1,8 +1,8 @@ package bundlecollection_test import ( - . "github.com/cloudfoundry/bosh-agent/agent/applier/bundlecollection" - "github.com/cloudfoundry/bosh-agent/agent/tarpath/tarpathfakes" + . "github.com/cloudfoundry/bosh-agent/v2/agent/applier/bundlecollection" + "github.com/cloudfoundry/bosh-agent/v2/agent/tarpath/tarpathfakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" @@ -12,7 +12,7 @@ import ( "time" - "github.com/cloudfoundry/bosh-agent/agent/applier/bundlecollection/fakes" + "github.com/cloudfoundry/bosh-agent/v2/agent/applier/bundlecollection/fakes" fakefileutil "github.com/cloudfoundry/bosh-utils/fileutil/fakes" boshlog "github.com/cloudfoundry/bosh-utils/logger" fakesys "github.com/cloudfoundry/bosh-utils/system/fakes" diff --git a/agent/applier/bundlecollection/file_bundle_test.go b/agent/applier/bundlecollection/file_bundle_test.go index f463bda1d..0ee999149 100644 --- a/agent/applier/bundlecollection/file_bundle_test.go +++ b/agent/applier/bundlecollection/file_bundle_test.go @@ -8,9 +8,9 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/cloudfoundry/bosh-agent/agent/applier/bundlecollection" - "github.com/cloudfoundry/bosh-agent/agent/applier/bundlecollection/fakes" - "github.com/cloudfoundry/bosh-agent/agent/tarpath/tarpathfakes" + . "github.com/cloudfoundry/bosh-agent/v2/agent/applier/bundlecollection" + "github.com/cloudfoundry/bosh-agent/v2/agent/applier/bundlecollection/fakes" + "github.com/cloudfoundry/bosh-agent/v2/agent/tarpath/tarpathfakes" fakefileutil "github.com/cloudfoundry/bosh-utils/fileutil/fakes" boshlog "github.com/cloudfoundry/bosh-utils/logger" fakesys "github.com/cloudfoundry/bosh-utils/system/fakes" diff --git a/agent/applier/bundlecollection/file_bundle_windows_test.go b/agent/applier/bundlecollection/file_bundle_windows_test.go index 659ada8b5..cd4185a80 100644 --- a/agent/applier/bundlecollection/file_bundle_windows_test.go +++ b/agent/applier/bundlecollection/file_bundle_windows_test.go @@ -6,12 +6,12 @@ package bundlecollection_test import ( "os" - "github.com/cloudfoundry/bosh-agent/agent/tarpath/tarpathfakes" + "github.com/cloudfoundry/bosh-agent/v2/agent/tarpath/tarpathfakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/cloudfoundry/bosh-agent/agent/applier/bundlecollection" - "github.com/cloudfoundry/bosh-agent/agent/applier/bundlecollection/fakes" + . "github.com/cloudfoundry/bosh-agent/v2/agent/applier/bundlecollection" + "github.com/cloudfoundry/bosh-agent/v2/agent/applier/bundlecollection/fakes" fakefileutil "github.com/cloudfoundry/bosh-utils/fileutil/fakes" boshlog "github.com/cloudfoundry/bosh-utils/logger" fakesys "github.com/cloudfoundry/bosh-utils/system/fakes" diff --git a/agent/applier/concrete_applier.go b/agent/applier/concrete_applier.go index 816e3dfb9..1c52fc29b 100644 --- a/agent/applier/concrete_applier.go +++ b/agent/applier/concrete_applier.go @@ -1,12 +1,12 @@ package applier import ( - as "github.com/cloudfoundry/bosh-agent/agent/applier/applyspec" - "github.com/cloudfoundry/bosh-agent/agent/applier/jobs" - "github.com/cloudfoundry/bosh-agent/agent/applier/packages" - boshjobsuper "github.com/cloudfoundry/bosh-agent/jobsupervisor" - boshsettings "github.com/cloudfoundry/bosh-agent/settings" - boshdirs "github.com/cloudfoundry/bosh-agent/settings/directories" + as "github.com/cloudfoundry/bosh-agent/v2/agent/applier/applyspec" + "github.com/cloudfoundry/bosh-agent/v2/agent/applier/jobs" + "github.com/cloudfoundry/bosh-agent/v2/agent/applier/packages" + boshjobsuper "github.com/cloudfoundry/bosh-agent/v2/jobsupervisor" + boshsettings "github.com/cloudfoundry/bosh-agent/v2/settings" + boshdirs "github.com/cloudfoundry/bosh-agent/v2/settings/directories" bosherr "github.com/cloudfoundry/bosh-utils/errors" "github.com/cloudfoundry/bosh-utils/work" ) diff --git a/agent/applier/concrete_applier_test.go b/agent/applier/concrete_applier_test.go index 0b287a3b1..76b693418 100644 --- a/agent/applier/concrete_applier_test.go +++ b/agent/applier/concrete_applier_test.go @@ -7,15 +7,15 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/cloudfoundry/bosh-agent/agent/applier" - fakeas "github.com/cloudfoundry/bosh-agent/agent/applier/applyspec/fakes" - fakejobs "github.com/cloudfoundry/bosh-agent/agent/applier/jobs/jobsfakes" - "github.com/cloudfoundry/bosh-agent/agent/applier/models" - fakepackages "github.com/cloudfoundry/bosh-agent/agent/applier/packages/fakes" - fakejobsuper "github.com/cloudfoundry/bosh-agent/jobsupervisor/fakes" - boshsettings "github.com/cloudfoundry/bosh-agent/settings" - boshdirs "github.com/cloudfoundry/bosh-agent/settings/directories" - fakesettings "github.com/cloudfoundry/bosh-agent/settings/fakes" + "github.com/cloudfoundry/bosh-agent/v2/agent/applier" + fakeas "github.com/cloudfoundry/bosh-agent/v2/agent/applier/applyspec/fakes" + fakejobs "github.com/cloudfoundry/bosh-agent/v2/agent/applier/jobs/jobsfakes" + "github.com/cloudfoundry/bosh-agent/v2/agent/applier/models" + fakepackages "github.com/cloudfoundry/bosh-agent/v2/agent/applier/packages/fakes" + fakejobsuper "github.com/cloudfoundry/bosh-agent/v2/jobsupervisor/fakes" + boshsettings "github.com/cloudfoundry/bosh-agent/v2/settings" + boshdirs "github.com/cloudfoundry/bosh-agent/v2/settings/directories" + fakesettings "github.com/cloudfoundry/bosh-agent/v2/settings/fakes" boshuuid "github.com/cloudfoundry/bosh-utils/uuid" "github.com/stretchr/testify/assert" ) diff --git a/agent/applier/fakes/fake_applier.go b/agent/applier/fakes/fake_applier.go index b4f1e1233..444cb5c36 100644 --- a/agent/applier/fakes/fake_applier.go +++ b/agent/applier/fakes/fake_applier.go @@ -1,8 +1,8 @@ package fakes import ( - boshas "github.com/cloudfoundry/bosh-agent/agent/applier/applyspec" - "github.com/cloudfoundry/bosh-agent/agent/applier/models" + boshas "github.com/cloudfoundry/bosh-agent/v2/agent/applier/applyspec" + "github.com/cloudfoundry/bosh-agent/v2/agent/applier/models" ) type FakeApplier struct { diff --git a/agent/applier/jobs/applier_interface.go b/agent/applier/jobs/applier_interface.go index 4ce6530b1..f7807d462 100644 --- a/agent/applier/jobs/applier_interface.go +++ b/agent/applier/jobs/applier_interface.go @@ -1,7 +1,7 @@ package jobs import ( - "github.com/cloudfoundry/bosh-agent/agent/applier/models" + "github.com/cloudfoundry/bosh-agent/v2/agent/applier/models" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . Applier diff --git a/agent/applier/jobs/jobsfakes/fake_applier.go b/agent/applier/jobs/jobsfakes/fake_applier.go index d62714268..8b9acb972 100644 --- a/agent/applier/jobs/jobsfakes/fake_applier.go +++ b/agent/applier/jobs/jobsfakes/fake_applier.go @@ -4,8 +4,8 @@ package jobsfakes import ( "sync" - "github.com/cloudfoundry/bosh-agent/agent/applier/jobs" - "github.com/cloudfoundry/bosh-agent/agent/applier/models" + "github.com/cloudfoundry/bosh-agent/v2/agent/applier/jobs" + "github.com/cloudfoundry/bosh-agent/v2/agent/applier/models" ) type FakeApplier struct { diff --git a/agent/applier/jobs/rendered_job_applier.go b/agent/applier/jobs/rendered_job_applier.go index 320443a36..b12ada6ce 100644 --- a/agent/applier/jobs/rendered_job_applier.go +++ b/agent/applier/jobs/rendered_job_applier.go @@ -5,13 +5,13 @@ import ( "path" "strings" - "github.com/cloudfoundry/bosh-agent/agent/applier/models" - "github.com/cloudfoundry/bosh-agent/agent/applier/packages" - "github.com/cloudfoundry/bosh-agent/agent/httpblobprovider/blobstore_delegator" - "github.com/cloudfoundry/bosh-agent/settings/directories" + "github.com/cloudfoundry/bosh-agent/v2/agent/applier/models" + "github.com/cloudfoundry/bosh-agent/v2/agent/applier/packages" + "github.com/cloudfoundry/bosh-agent/v2/agent/httpblobprovider/blobstore_delegator" + "github.com/cloudfoundry/bosh-agent/v2/settings/directories" - boshbc "github.com/cloudfoundry/bosh-agent/agent/applier/bundlecollection" - boshjobsuper "github.com/cloudfoundry/bosh-agent/jobsupervisor" + boshbc "github.com/cloudfoundry/bosh-agent/v2/agent/applier/bundlecollection" + boshjobsuper "github.com/cloudfoundry/bosh-agent/v2/jobsupervisor" boshcrypto "github.com/cloudfoundry/bosh-utils/crypto" bosherr "github.com/cloudfoundry/bosh-utils/errors" boshlog "github.com/cloudfoundry/bosh-utils/logger" diff --git a/agent/applier/jobs/rendered_job_applier_test.go b/agent/applier/jobs/rendered_job_applier_test.go index cdd035ea4..7f1b0b3b9 100644 --- a/agent/applier/jobs/rendered_job_applier_test.go +++ b/agent/applier/jobs/rendered_job_applier_test.go @@ -7,20 +7,20 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/cloudfoundry/bosh-agent/agent/applier/jobs" - "github.com/cloudfoundry/bosh-agent/agent/applier/models" - "github.com/cloudfoundry/bosh-agent/settings/directories" + "github.com/cloudfoundry/bosh-agent/v2/agent/applier/jobs" + "github.com/cloudfoundry/bosh-agent/v2/agent/applier/models" + "github.com/cloudfoundry/bosh-agent/v2/settings/directories" - boshbc "github.com/cloudfoundry/bosh-agent/agent/applier/bundlecollection" + boshbc "github.com/cloudfoundry/bosh-agent/v2/agent/applier/bundlecollection" boshcrypto "github.com/cloudfoundry/bosh-utils/crypto" boshlog "github.com/cloudfoundry/bosh-utils/logger" boshsys "github.com/cloudfoundry/bosh-utils/system" boshuuid "github.com/cloudfoundry/bosh-utils/uuid" - fakebc "github.com/cloudfoundry/bosh-agent/agent/applier/bundlecollection/fakes" - fakepackages "github.com/cloudfoundry/bosh-agent/agent/applier/packages/fakes" - fakeblobdelegator "github.com/cloudfoundry/bosh-agent/agent/httpblobprovider/blobstore_delegator/blobstore_delegatorfakes" - fakejobsuper "github.com/cloudfoundry/bosh-agent/jobsupervisor/fakes" + fakebc "github.com/cloudfoundry/bosh-agent/v2/agent/applier/bundlecollection/fakes" + fakepackages "github.com/cloudfoundry/bosh-agent/v2/agent/applier/packages/fakes" + fakeblobdelegator "github.com/cloudfoundry/bosh-agent/v2/agent/httpblobprovider/blobstore_delegator/blobstore_delegatorfakes" + fakejobsuper "github.com/cloudfoundry/bosh-agent/v2/jobsupervisor/fakes" fakesys "github.com/cloudfoundry/bosh-utils/system/fakes" ) diff --git a/agent/applier/models/job_test.go b/agent/applier/models/job_test.go index c9288fc30..685c63fd6 100644 --- a/agent/applier/models/job_test.go +++ b/agent/applier/models/job_test.go @@ -6,8 +6,8 @@ import ( "os" - . "github.com/cloudfoundry/bosh-agent/agent/applier/models" - "github.com/cloudfoundry/bosh-agent/settings/directories" + . "github.com/cloudfoundry/bosh-agent/v2/agent/applier/models" + "github.com/cloudfoundry/bosh-agent/v2/settings/directories" "github.com/cloudfoundry/bosh-utils/crypto" fakesys "github.com/cloudfoundry/bosh-utils/system/fakes" diff --git a/agent/applier/models/package_test.go b/agent/applier/models/package_test.go index 35f8cb167..cac312b82 100644 --- a/agent/applier/models/package_test.go +++ b/agent/applier/models/package_test.go @@ -4,7 +4,7 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/cloudfoundry/bosh-agent/agent/applier/models" + . "github.com/cloudfoundry/bosh-agent/v2/agent/applier/models" "github.com/cloudfoundry/bosh-utils/crypto" ) diff --git a/agent/applier/packages/applier_interface.go b/agent/applier/packages/applier_interface.go index f0d9455a9..689baa169 100644 --- a/agent/applier/packages/applier_interface.go +++ b/agent/applier/packages/applier_interface.go @@ -1,7 +1,7 @@ package packages import ( - models "github.com/cloudfoundry/bosh-agent/agent/applier/models" + models "github.com/cloudfoundry/bosh-agent/v2/agent/applier/models" ) type Applier interface { diff --git a/agent/applier/packages/applier_provider_interface.go b/agent/applier/packages/applier_provider_interface.go index 69b0bd96f..2eb2fd107 100644 --- a/agent/applier/packages/applier_provider_interface.go +++ b/agent/applier/packages/applier_provider_interface.go @@ -1,7 +1,7 @@ package packages import ( - boshbc "github.com/cloudfoundry/bosh-agent/agent/applier/bundlecollection" + boshbc "github.com/cloudfoundry/bosh-agent/v2/agent/applier/bundlecollection" ) type ApplierProvider interface { diff --git a/agent/applier/packages/compiled_package_applier.go b/agent/applier/packages/compiled_package_applier.go index 488326fdb..525d4b731 100644 --- a/agent/applier/packages/compiled_package_applier.go +++ b/agent/applier/packages/compiled_package_applier.go @@ -1,9 +1,9 @@ package packages import ( - bc "github.com/cloudfoundry/bosh-agent/agent/applier/bundlecollection" - models "github.com/cloudfoundry/bosh-agent/agent/applier/models" - "github.com/cloudfoundry/bosh-agent/agent/httpblobprovider/blobstore_delegator" + bc "github.com/cloudfoundry/bosh-agent/v2/agent/applier/bundlecollection" + models "github.com/cloudfoundry/bosh-agent/v2/agent/applier/models" + "github.com/cloudfoundry/bosh-agent/v2/agent/httpblobprovider/blobstore_delegator" bosherr "github.com/cloudfoundry/bosh-utils/errors" boshlog "github.com/cloudfoundry/bosh-utils/logger" boshsys "github.com/cloudfoundry/bosh-utils/system" diff --git a/agent/applier/packages/compiled_package_applier_provider.go b/agent/applier/packages/compiled_package_applier_provider.go index c902573e4..d88fe72a9 100644 --- a/agent/applier/packages/compiled_package_applier_provider.go +++ b/agent/applier/packages/compiled_package_applier_provider.go @@ -6,8 +6,8 @@ import ( "os" "code.cloudfoundry.org/clock" - boshbc "github.com/cloudfoundry/bosh-agent/agent/applier/bundlecollection" - "github.com/cloudfoundry/bosh-agent/agent/httpblobprovider/blobstore_delegator" + boshbc "github.com/cloudfoundry/bosh-agent/v2/agent/applier/bundlecollection" + "github.com/cloudfoundry/bosh-agent/v2/agent/httpblobprovider/blobstore_delegator" boshcmd "github.com/cloudfoundry/bosh-utils/fileutil" boshlog "github.com/cloudfoundry/bosh-utils/logger" boshsys "github.com/cloudfoundry/bosh-utils/system" diff --git a/agent/applier/packages/compiled_package_applier_provider_test.go b/agent/applier/packages/compiled_package_applier_provider_test.go index 074854299..7bff02027 100644 --- a/agent/applier/packages/compiled_package_applier_provider_test.go +++ b/agent/applier/packages/compiled_package_applier_provider_test.go @@ -6,10 +6,10 @@ import ( "os" - boshbc "github.com/cloudfoundry/bosh-agent/agent/applier/bundlecollection" - "github.com/cloudfoundry/bosh-agent/agent/applier/bundlecollection/fakes" - . "github.com/cloudfoundry/bosh-agent/agent/applier/packages" - fakeblobdelegator "github.com/cloudfoundry/bosh-agent/agent/httpblobprovider/blobstore_delegator/blobstore_delegatorfakes" + boshbc "github.com/cloudfoundry/bosh-agent/v2/agent/applier/bundlecollection" + "github.com/cloudfoundry/bosh-agent/v2/agent/applier/bundlecollection/fakes" + . "github.com/cloudfoundry/bosh-agent/v2/agent/applier/packages" + fakeblobdelegator "github.com/cloudfoundry/bosh-agent/v2/agent/httpblobprovider/blobstore_delegator/blobstore_delegatorfakes" fakecmd "github.com/cloudfoundry/bosh-utils/fileutil/fakes" boshlog "github.com/cloudfoundry/bosh-utils/logger" fakesys "github.com/cloudfoundry/bosh-utils/system/fakes" diff --git a/agent/applier/packages/compiled_package_applier_test.go b/agent/applier/packages/compiled_package_applier_test.go index 8a9b52601..efad7b473 100644 --- a/agent/applier/packages/compiled_package_applier_test.go +++ b/agent/applier/packages/compiled_package_applier_test.go @@ -6,11 +6,11 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - boshbc "github.com/cloudfoundry/bosh-agent/agent/applier/bundlecollection" - fakebc "github.com/cloudfoundry/bosh-agent/agent/applier/bundlecollection/fakes" - "github.com/cloudfoundry/bosh-agent/agent/applier/models" - . "github.com/cloudfoundry/bosh-agent/agent/applier/packages" - fakeblobdelegator "github.com/cloudfoundry/bosh-agent/agent/httpblobprovider/blobstore_delegator/blobstore_delegatorfakes" + boshbc "github.com/cloudfoundry/bosh-agent/v2/agent/applier/bundlecollection" + fakebc "github.com/cloudfoundry/bosh-agent/v2/agent/applier/bundlecollection/fakes" + "github.com/cloudfoundry/bosh-agent/v2/agent/applier/models" + . "github.com/cloudfoundry/bosh-agent/v2/agent/applier/packages" + fakeblobdelegator "github.com/cloudfoundry/bosh-agent/v2/agent/httpblobprovider/blobstore_delegator/blobstore_delegatorfakes" boshcrypto "github.com/cloudfoundry/bosh-utils/crypto" boshlog "github.com/cloudfoundry/bosh-utils/logger" fakesys "github.com/cloudfoundry/bosh-utils/system/fakes" diff --git a/agent/applier/packages/fakes/fake_applier.go b/agent/applier/packages/fakes/fake_applier.go index 38768e8f4..fd9122992 100644 --- a/agent/applier/packages/fakes/fake_applier.go +++ b/agent/applier/packages/fakes/fake_applier.go @@ -3,7 +3,7 @@ package fakes import ( "sync" - models "github.com/cloudfoundry/bosh-agent/agent/applier/models" + models "github.com/cloudfoundry/bosh-agent/v2/agent/applier/models" ) type FakeApplier struct { diff --git a/agent/applier/packages/fakes/fake_applier_provider.go b/agent/applier/packages/fakes/fake_applier_provider.go index 8c50d859f..39bbed2ad 100644 --- a/agent/applier/packages/fakes/fake_applier_provider.go +++ b/agent/applier/packages/fakes/fake_applier_provider.go @@ -1,8 +1,8 @@ package fakes import ( - boshbc "github.com/cloudfoundry/bosh-agent/agent/applier/bundlecollection" - boshpackages "github.com/cloudfoundry/bosh-agent/agent/applier/packages" + boshbc "github.com/cloudfoundry/bosh-agent/v2/agent/applier/bundlecollection" + boshpackages "github.com/cloudfoundry/bosh-agent/v2/agent/applier/packages" ) type FakeApplierProvider struct { diff --git a/agent/blobstore/blob_manager_test.go b/agent/blobstore/blob_manager_test.go index ec47984ef..17bb52344 100644 --- a/agent/blobstore/blob_manager_test.go +++ b/agent/blobstore/blob_manager_test.go @@ -13,7 +13,7 @@ import ( boshlog "github.com/cloudfoundry/bosh-utils/logger" boshsys "github.com/cloudfoundry/bosh-utils/system" - boshagentblobstore "github.com/cloudfoundry/bosh-agent/agent/blobstore" + boshagentblobstore "github.com/cloudfoundry/bosh-agent/v2/agent/blobstore" ) var _ = Describe("Blob Manager", func() { diff --git a/agent/blobstore/blobstorefakes/fake_blob_manager_interface.go b/agent/blobstore/blobstorefakes/fake_blob_manager_interface.go index e2a9a5ea4..6e658d03e 100644 --- a/agent/blobstore/blobstorefakes/fake_blob_manager_interface.go +++ b/agent/blobstore/blobstorefakes/fake_blob_manager_interface.go @@ -5,7 +5,7 @@ import ( "io" "sync" - "github.com/cloudfoundry/bosh-agent/agent/blobstore" + "github.com/cloudfoundry/bosh-agent/v2/agent/blobstore" "github.com/cloudfoundry/bosh-utils/crypto" "github.com/cloudfoundry/bosh-utils/system" ) diff --git a/agent/blobstore/cascading_blobstore_test.go b/agent/blobstore/cascading_blobstore_test.go index 2503d9367..6ccb4eac9 100644 --- a/agent/blobstore/cascading_blobstore_test.go +++ b/agent/blobstore/cascading_blobstore_test.go @@ -8,8 +8,8 @@ import ( "errors" - "github.com/cloudfoundry/bosh-agent/agent/blobstore" - fakeagentblob "github.com/cloudfoundry/bosh-agent/agent/blobstore/blobstorefakes" + "github.com/cloudfoundry/bosh-agent/v2/agent/blobstore" + fakeagentblob "github.com/cloudfoundry/bosh-agent/v2/agent/blobstore/blobstorefakes" boshblob "github.com/cloudfoundry/bosh-utils/blobstore" fakeblob "github.com/cloudfoundry/bosh-utils/blobstore/fakes" boshcrypto "github.com/cloudfoundry/bosh-utils/crypto" diff --git a/agent/bootonce/start_manager.go b/agent/bootonce/start_manager.go index 5c4a910df..8f5789e56 100644 --- a/agent/bootonce/start_manager.go +++ b/agent/bootonce/start_manager.go @@ -3,8 +3,8 @@ package bootonce import ( "path/filepath" - boshsettings "github.com/cloudfoundry/bosh-agent/settings" - boshdir "github.com/cloudfoundry/bosh-agent/settings/directories" + boshsettings "github.com/cloudfoundry/bosh-agent/v2/settings" + boshdir "github.com/cloudfoundry/bosh-agent/v2/settings/directories" boshsys "github.com/cloudfoundry/bosh-utils/system" ) diff --git a/agent/bootonce/start_manager_test.go b/agent/bootonce/start_manager_test.go index 78346648e..88a64632f 100644 --- a/agent/bootonce/start_manager_test.go +++ b/agent/bootonce/start_manager_test.go @@ -7,11 +7,11 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - boshdir "github.com/cloudfoundry/bosh-agent/settings/directories" - fakesettings "github.com/cloudfoundry/bosh-agent/settings/fakes" + boshdir "github.com/cloudfoundry/bosh-agent/v2/settings/directories" + fakesettings "github.com/cloudfoundry/bosh-agent/v2/settings/fakes" fakesys "github.com/cloudfoundry/bosh-utils/system/fakes" - "github.com/cloudfoundry/bosh-agent/agent/bootonce" + "github.com/cloudfoundry/bosh-agent/v2/agent/bootonce" ) var _ = Describe("checking if the agent can be booted", func() { diff --git a/agent/bootstrap.go b/agent/bootstrap.go index 556d24a1e..193b1a426 100644 --- a/agent/bootstrap.go +++ b/agent/bootstrap.go @@ -6,10 +6,10 @@ import ( "path" "path/filepath" - "github.com/cloudfoundry/bosh-agent/agent/applier/applyspec" - boshplatform "github.com/cloudfoundry/bosh-agent/platform" - boshsettings "github.com/cloudfoundry/bosh-agent/settings" - boshdir "github.com/cloudfoundry/bosh-agent/settings/directories" + "github.com/cloudfoundry/bosh-agent/v2/agent/applier/applyspec" + boshplatform "github.com/cloudfoundry/bosh-agent/v2/platform" + boshsettings "github.com/cloudfoundry/bosh-agent/v2/settings" + boshdir "github.com/cloudfoundry/bosh-agent/v2/settings/directories" bosherr "github.com/cloudfoundry/bosh-utils/errors" boshlog "github.com/cloudfoundry/bosh-utils/logger" boshsys "github.com/cloudfoundry/bosh-utils/system" diff --git a/agent/bootstrap_test.go b/agent/bootstrap_test.go index fd58b1f56..de5f43cf8 100644 --- a/agent/bootstrap_test.go +++ b/agent/bootstrap_test.go @@ -9,49 +9,49 @@ import ( "path/filepath" "time" - boshlogstarprovider "github.com/cloudfoundry/bosh-agent/agent/logstarprovider" + boshlogstarprovider "github.com/cloudfoundry/bosh-agent/v2/agent/logstarprovider" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/cloudfoundry/bosh-agent/agent" - "github.com/cloudfoundry/bosh-agent/agent/applier/applyspec" - "github.com/cloudfoundry/bosh-agent/agent/applier/applyspec/fakes" - fakedevicepathresolver "github.com/cloudfoundry/bosh-agent/infrastructure/devicepathresolver/fakes" - "github.com/cloudfoundry/bosh-agent/platform/disk/diskfakes" - "github.com/cloudfoundry/bosh-agent/platform/platformfakes" - "github.com/cloudfoundry/bosh-agent/servicemanager/servicemanagerfakes" + "github.com/cloudfoundry/bosh-agent/v2/agent" + "github.com/cloudfoundry/bosh-agent/v2/agent/applier/applyspec" + "github.com/cloudfoundry/bosh-agent/v2/agent/applier/applyspec/fakes" + fakedevicepathresolver "github.com/cloudfoundry/bosh-agent/v2/infrastructure/devicepathresolver/fakes" + "github.com/cloudfoundry/bosh-agent/v2/platform/disk/diskfakes" + "github.com/cloudfoundry/bosh-agent/v2/platform/platformfakes" + "github.com/cloudfoundry/bosh-agent/v2/servicemanager/servicemanagerfakes" sigar "github.com/cloudfoundry/gosigar" fakelogger "github.com/cloudfoundry/bosh-utils/logger/loggerfakes" fakesys "github.com/cloudfoundry/bosh-utils/system/fakes" - fakeinf "github.com/cloudfoundry/bosh-agent/infrastructure/fakes" - fakedisk "github.com/cloudfoundry/bosh-agent/platform/disk/fakes" - fakeplatform "github.com/cloudfoundry/bosh-agent/platform/fakes" - fakeip "github.com/cloudfoundry/bosh-agent/platform/net/ip/fakes" - "github.com/cloudfoundry/bosh-agent/platform/net/netfakes" - fakesettings "github.com/cloudfoundry/bosh-agent/settings/fakes" + fakeinf "github.com/cloudfoundry/bosh-agent/v2/infrastructure/fakes" + fakedisk "github.com/cloudfoundry/bosh-agent/v2/platform/disk/fakes" + fakeplatform "github.com/cloudfoundry/bosh-agent/v2/platform/fakes" + fakeip "github.com/cloudfoundry/bosh-agent/v2/platform/net/ip/fakes" + "github.com/cloudfoundry/bosh-agent/v2/platform/net/netfakes" + fakesettings "github.com/cloudfoundry/bosh-agent/v2/settings/fakes" boshcmd "github.com/cloudfoundry/bosh-utils/fileutil" boshlog "github.com/cloudfoundry/bosh-utils/logger" boshretry "github.com/cloudfoundry/bosh-utils/retrystrategy" boshuuid "github.com/cloudfoundry/bosh-utils/uuid" - boshplatform "github.com/cloudfoundry/bosh-agent/platform" - boshcdrom "github.com/cloudfoundry/bosh-agent/platform/cdrom" - boshcert "github.com/cloudfoundry/bosh-agent/platform/cert" - boshdisk "github.com/cloudfoundry/bosh-agent/platform/disk" - boshnet "github.com/cloudfoundry/bosh-agent/platform/net" - bosharp "github.com/cloudfoundry/bosh-agent/platform/net/arp" - boshdnsresolver "github.com/cloudfoundry/bosh-agent/platform/net/dnsresolver" - boship "github.com/cloudfoundry/bosh-agent/platform/net/ip" - boshudev "github.com/cloudfoundry/bosh-agent/platform/udevdevice" - boshvitals "github.com/cloudfoundry/bosh-agent/platform/vitals" - boshsettings "github.com/cloudfoundry/bosh-agent/settings" - boshdirs "github.com/cloudfoundry/bosh-agent/settings/directories" - boshsigar "github.com/cloudfoundry/bosh-agent/sigar" + boshplatform "github.com/cloudfoundry/bosh-agent/v2/platform" + boshcdrom "github.com/cloudfoundry/bosh-agent/v2/platform/cdrom" + boshcert "github.com/cloudfoundry/bosh-agent/v2/platform/cert" + boshdisk "github.com/cloudfoundry/bosh-agent/v2/platform/disk" + boshnet "github.com/cloudfoundry/bosh-agent/v2/platform/net" + bosharp "github.com/cloudfoundry/bosh-agent/v2/platform/net/arp" + boshdnsresolver "github.com/cloudfoundry/bosh-agent/v2/platform/net/dnsresolver" + boship "github.com/cloudfoundry/bosh-agent/v2/platform/net/ip" + boshudev "github.com/cloudfoundry/bosh-agent/v2/platform/udevdevice" + boshvitals "github.com/cloudfoundry/bosh-agent/v2/platform/vitals" + boshsettings "github.com/cloudfoundry/bosh-agent/v2/settings" + boshdirs "github.com/cloudfoundry/bosh-agent/v2/settings/directories" + boshsigar "github.com/cloudfoundry/bosh-agent/v2/sigar" ) var _ = Describe("bootstrap", func() { diff --git a/agent/cmdrunner/fakes/fake_file_logging_cmd_runner.go b/agent/cmdrunner/fakes/fake_file_logging_cmd_runner.go index a836df53a..8cd8bc89d 100644 --- a/agent/cmdrunner/fakes/fake_file_logging_cmd_runner.go +++ b/agent/cmdrunner/fakes/fake_file_logging_cmd_runner.go @@ -1,7 +1,7 @@ package fakes import ( - boshcmdrunner "github.com/cloudfoundry/bosh-agent/agent/cmdrunner" + boshcmdrunner "github.com/cloudfoundry/bosh-agent/v2/agent/cmdrunner" boshsys "github.com/cloudfoundry/bosh-utils/system" ) diff --git a/agent/cmdrunner/file_logging_cmd_runner_test.go b/agent/cmdrunner/file_logging_cmd_runner_test.go index 65e42eeb9..1b000eb67 100644 --- a/agent/cmdrunner/file_logging_cmd_runner_test.go +++ b/agent/cmdrunner/file_logging_cmd_runner_test.go @@ -7,7 +7,7 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/cloudfoundry/bosh-agent/agent/cmdrunner" + . "github.com/cloudfoundry/bosh-agent/v2/agent/cmdrunner" boshsys "github.com/cloudfoundry/bosh-utils/system" fakesys "github.com/cloudfoundry/bosh-utils/system/fakes" ) diff --git a/agent/compiler/compiler_interface.go b/agent/compiler/compiler_interface.go index a8663dbec..27e1b5445 100644 --- a/agent/compiler/compiler_interface.go +++ b/agent/compiler/compiler_interface.go @@ -1,7 +1,7 @@ package compiler import ( - boshmodels "github.com/cloudfoundry/bosh-agent/agent/applier/models" + boshmodels "github.com/cloudfoundry/bosh-agent/v2/agent/applier/models" boshcrypto "github.com/cloudfoundry/bosh-utils/crypto" ) diff --git a/agent/compiler/concrete_compiler.go b/agent/compiler/concrete_compiler.go index 327e7a86f..9a2b56a42 100644 --- a/agent/compiler/concrete_compiler.go +++ b/agent/compiler/concrete_compiler.go @@ -7,11 +7,11 @@ import ( "code.cloudfoundry.org/clock" - boshbc "github.com/cloudfoundry/bosh-agent/agent/applier/bundlecollection" - boshmodels "github.com/cloudfoundry/bosh-agent/agent/applier/models" - "github.com/cloudfoundry/bosh-agent/agent/applier/packages" - boshcmdrunner "github.com/cloudfoundry/bosh-agent/agent/cmdrunner" - "github.com/cloudfoundry/bosh-agent/agent/httpblobprovider/blobstore_delegator" + boshbc "github.com/cloudfoundry/bosh-agent/v2/agent/applier/bundlecollection" + boshmodels "github.com/cloudfoundry/bosh-agent/v2/agent/applier/models" + "github.com/cloudfoundry/bosh-agent/v2/agent/applier/packages" + boshcmdrunner "github.com/cloudfoundry/bosh-agent/v2/agent/cmdrunner" + "github.com/cloudfoundry/bosh-agent/v2/agent/httpblobprovider/blobstore_delegator" boshcrypto "github.com/cloudfoundry/bosh-utils/crypto" bosherr "github.com/cloudfoundry/bosh-utils/errors" boshcmd "github.com/cloudfoundry/bosh-utils/fileutil" diff --git a/agent/compiler/concrete_compiler_test.go b/agent/compiler/concrete_compiler_test.go index 95a8f5a53..12c13a8e6 100644 --- a/agent/compiler/concrete_compiler_test.go +++ b/agent/compiler/concrete_compiler_test.go @@ -9,13 +9,13 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/cloudfoundry/bosh-agent/agent/compiler" + . "github.com/cloudfoundry/bosh-agent/v2/agent/compiler" - fakebc "github.com/cloudfoundry/bosh-agent/agent/applier/bundlecollection/fakes" - boshmodels "github.com/cloudfoundry/bosh-agent/agent/applier/models" - fakepackages "github.com/cloudfoundry/bosh-agent/agent/applier/packages/fakes" - fakecmdrunner "github.com/cloudfoundry/bosh-agent/agent/cmdrunner/fakes" - fakeblobdelegator "github.com/cloudfoundry/bosh-agent/agent/httpblobprovider/blobstore_delegator/blobstore_delegatorfakes" + fakebc "github.com/cloudfoundry/bosh-agent/v2/agent/applier/bundlecollection/fakes" + boshmodels "github.com/cloudfoundry/bosh-agent/v2/agent/applier/models" + fakepackages "github.com/cloudfoundry/bosh-agent/v2/agent/applier/packages/fakes" + fakecmdrunner "github.com/cloudfoundry/bosh-agent/v2/agent/cmdrunner/fakes" + fakeblobdelegator "github.com/cloudfoundry/bosh-agent/v2/agent/httpblobprovider/blobstore_delegator/blobstore_delegatorfakes" boshcrypto "github.com/cloudfoundry/bosh-utils/crypto" fakecmd "github.com/cloudfoundry/bosh-utils/fileutil/fakes" boshsys "github.com/cloudfoundry/bosh-utils/system" diff --git a/agent/compiler/concrete_compiler_windows_test.go b/agent/compiler/concrete_compiler_windows_test.go index 7f5bcd31a..9819cdf3a 100644 --- a/agent/compiler/concrete_compiler_windows_test.go +++ b/agent/compiler/concrete_compiler_windows_test.go @@ -8,12 +8,12 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - fakebc "github.com/cloudfoundry/bosh-agent/agent/applier/bundlecollection/fakes" - boshmodels "github.com/cloudfoundry/bosh-agent/agent/applier/models" - fakepackages "github.com/cloudfoundry/bosh-agent/agent/applier/packages/fakes" - fakecmdrunner "github.com/cloudfoundry/bosh-agent/agent/cmdrunner/fakes" - . "github.com/cloudfoundry/bosh-agent/agent/compiler" - fakeblobdelegator "github.com/cloudfoundry/bosh-agent/agent/httpblobprovider/blobstore_delegator/blobstore_delegatorfakes" + fakebc "github.com/cloudfoundry/bosh-agent/v2/agent/applier/bundlecollection/fakes" + boshmodels "github.com/cloudfoundry/bosh-agent/v2/agent/applier/models" + fakepackages "github.com/cloudfoundry/bosh-agent/v2/agent/applier/packages/fakes" + fakecmdrunner "github.com/cloudfoundry/bosh-agent/v2/agent/cmdrunner/fakes" + . "github.com/cloudfoundry/bosh-agent/v2/agent/compiler" + fakeblobdelegator "github.com/cloudfoundry/bosh-agent/v2/agent/httpblobprovider/blobstore_delegator/blobstore_delegatorfakes" fakecmd "github.com/cloudfoundry/bosh-utils/fileutil/fakes" fakesys "github.com/cloudfoundry/bosh-utils/system/fakes" diff --git a/agent/compiler/fakes/fake_compiler.go b/agent/compiler/fakes/fake_compiler.go index c33402fd3..668384b5e 100644 --- a/agent/compiler/fakes/fake_compiler.go +++ b/agent/compiler/fakes/fake_compiler.go @@ -1,8 +1,8 @@ package fakes import ( - boshmodels "github.com/cloudfoundry/bosh-agent/agent/applier/models" - boshcomp "github.com/cloudfoundry/bosh-agent/agent/compiler" + boshmodels "github.com/cloudfoundry/bosh-agent/v2/agent/applier/models" + boshcomp "github.com/cloudfoundry/bosh-agent/v2/agent/compiler" boshcrypto "github.com/cloudfoundry/bosh-utils/crypto" ) diff --git a/agent/fakes/fake_action_dispatcher.go b/agent/fakes/fake_action_dispatcher.go index ee38839d4..4b840664a 100644 --- a/agent/fakes/fake_action_dispatcher.go +++ b/agent/fakes/fake_action_dispatcher.go @@ -1,7 +1,7 @@ package fakes import ( - boshhandler "github.com/cloudfoundry/bosh-agent/handler" + boshhandler "github.com/cloudfoundry/bosh-agent/v2/handler" ) type FakeActionDispatcher struct { diff --git a/agent/heartbeat.go b/agent/heartbeat.go index 223da39cb..b3f8e58e1 100644 --- a/agent/heartbeat.go +++ b/agent/heartbeat.go @@ -1,7 +1,7 @@ package agent import ( - boshvitals "github.com/cloudfoundry/bosh-agent/platform/vitals" + boshvitals "github.com/cloudfoundry/bosh-agent/v2/platform/vitals" ) // NodeID is no longer being used by the director as of completion of diff --git a/agent/heartbeat_test.go b/agent/heartbeat_test.go index e20d9a6b5..8a5c5d756 100644 --- a/agent/heartbeat_test.go +++ b/agent/heartbeat_test.go @@ -6,8 +6,8 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/cloudfoundry/bosh-agent/agent" - boshvitals "github.com/cloudfoundry/bosh-agent/platform/vitals" + . "github.com/cloudfoundry/bosh-agent/v2/agent" + boshvitals "github.com/cloudfoundry/bosh-agent/v2/platform/vitals" ) func init() { //nolint:gochecknoinits diff --git a/agent/httpblobprovider/blobstore_delegator/blobstore_delegator.go b/agent/httpblobprovider/blobstore_delegator/blobstore_delegator.go index a92b23c6b..acd954b72 100644 --- a/agent/httpblobprovider/blobstore_delegator/blobstore_delegator.go +++ b/agent/httpblobprovider/blobstore_delegator/blobstore_delegator.go @@ -8,7 +8,7 @@ import ( boshlog "github.com/cloudfoundry/bosh-utils/logger" boshretry "github.com/cloudfoundry/bosh-utils/retrystrategy" - "github.com/cloudfoundry/bosh-agent/agent/httpblobprovider" + "github.com/cloudfoundry/bosh-agent/v2/agent/httpblobprovider" "github.com/cloudfoundry/bosh-utils/blobstore" boshcrypto "github.com/cloudfoundry/bosh-utils/crypto" ) diff --git a/agent/httpblobprovider/blobstore_delegator/blobstore_delegator_test.go b/agent/httpblobprovider/blobstore_delegator/blobstore_delegator_test.go index 2191982be..0c5947c2e 100644 --- a/agent/httpblobprovider/blobstore_delegator/blobstore_delegator_test.go +++ b/agent/httpblobprovider/blobstore_delegator/blobstore_delegator_test.go @@ -7,8 +7,8 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/cloudfoundry/bosh-agent/agent/httpblobprovider/blobstore_delegator" - fakeblobprovider "github.com/cloudfoundry/bosh-agent/agent/httpblobprovider/httpblobproviderfakes" + "github.com/cloudfoundry/bosh-agent/v2/agent/httpblobprovider/blobstore_delegator" + fakeblobprovider "github.com/cloudfoundry/bosh-agent/v2/agent/httpblobprovider/httpblobproviderfakes" fakeblobstore "github.com/cloudfoundry/bosh-utils/blobstore/fakes" boshcrypto "github.com/cloudfoundry/bosh-utils/crypto" diff --git a/agent/httpblobprovider/blobstore_delegator/blobstore_delegatorfakes/fake_blobstore_delegator.go b/agent/httpblobprovider/blobstore_delegator/blobstore_delegatorfakes/fake_blobstore_delegator.go index 0cbddf9a2..f1b6b88d5 100644 --- a/agent/httpblobprovider/blobstore_delegator/blobstore_delegatorfakes/fake_blobstore_delegator.go +++ b/agent/httpblobprovider/blobstore_delegator/blobstore_delegatorfakes/fake_blobstore_delegator.go @@ -4,7 +4,7 @@ package blobstore_delegatorfakes import ( "sync" - "github.com/cloudfoundry/bosh-agent/agent/httpblobprovider/blobstore_delegator" + "github.com/cloudfoundry/bosh-agent/v2/agent/httpblobprovider/blobstore_delegator" "github.com/cloudfoundry/bosh-utils/crypto" ) diff --git a/agent/httpblobprovider/blobstore_http_client.go b/agent/httpblobprovider/blobstore_http_client.go index 9e64fe858..15188f0ca 100644 --- a/agent/httpblobprovider/blobstore_http_client.go +++ b/agent/httpblobprovider/blobstore_http_client.go @@ -4,7 +4,7 @@ import ( "crypto/x509" "net/http" - "github.com/cloudfoundry/bosh-agent/settings" + "github.com/cloudfoundry/bosh-agent/v2/settings" boshblob "github.com/cloudfoundry/bosh-utils/blobstore" boshcrypto "github.com/cloudfoundry/bosh-utils/crypto" diff --git a/agent/httpblobprovider/blobstore_http_client_test.go b/agent/httpblobprovider/blobstore_http_client_test.go index cae0ef24c..6b861197f 100644 --- a/agent/httpblobprovider/blobstore_http_client_test.go +++ b/agent/httpblobprovider/blobstore_http_client_test.go @@ -6,8 +6,8 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - httpblobprovider "github.com/cloudfoundry/bosh-agent/agent/httpblobprovider" - "github.com/cloudfoundry/bosh-agent/settings" + httpblobprovider "github.com/cloudfoundry/bosh-agent/v2/agent/httpblobprovider" + "github.com/cloudfoundry/bosh-agent/v2/settings" boshcrypto "github.com/cloudfoundry/bosh-utils/crypto" ) diff --git a/agent/httpblobprovider/http_blob_provider_test.go b/agent/httpblobprovider/http_blob_provider_test.go index 55ec90d5f..6bf7fa9c0 100644 --- a/agent/httpblobprovider/http_blob_provider_test.go +++ b/agent/httpblobprovider/http_blob_provider_test.go @@ -5,7 +5,7 @@ import ( "net/http" "os" - . "github.com/cloudfoundry/bosh-agent/agent/httpblobprovider" + . "github.com/cloudfoundry/bosh-agent/v2/agent/httpblobprovider" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/onsi/gomega/ghttp" diff --git a/agent/httpblobprovider/httpblobproviderfakes/fake_httpblob_provider.go b/agent/httpblobprovider/httpblobproviderfakes/fake_httpblob_provider.go index 54a582495..1c80dd3b9 100644 --- a/agent/httpblobprovider/httpblobproviderfakes/fake_httpblob_provider.go +++ b/agent/httpblobprovider/httpblobproviderfakes/fake_httpblob_provider.go @@ -4,7 +4,7 @@ package httpblobproviderfakes import ( "sync" - "github.com/cloudfoundry/bosh-agent/agent/httpblobprovider" + "github.com/cloudfoundry/bosh-agent/v2/agent/httpblobprovider" "github.com/cloudfoundry/bosh-utils/crypto" ) diff --git a/agent/logstarprovider/logs_tar_provider.go b/agent/logstarprovider/logs_tar_provider.go index 682fbe8cb..c23ecdd49 100644 --- a/agent/logstarprovider/logs_tar_provider.go +++ b/agent/logstarprovider/logs_tar_provider.go @@ -4,7 +4,7 @@ import ( "runtime" "strings" - boshdirs "github.com/cloudfoundry/bosh-agent/settings/directories" + boshdirs "github.com/cloudfoundry/bosh-agent/v2/settings/directories" bosherr "github.com/cloudfoundry/bosh-utils/errors" boshcmd "github.com/cloudfoundry/bosh-utils/fileutil" ) diff --git a/agent/logstarprovider/logs_tar_provider_test.go b/agent/logstarprovider/logs_tar_provider_test.go index 243613d06..98d9fd655 100644 --- a/agent/logstarprovider/logs_tar_provider_test.go +++ b/agent/logstarprovider/logs_tar_provider_test.go @@ -4,7 +4,7 @@ import ( "errors" "runtime" - boshdirs "github.com/cloudfoundry/bosh-agent/settings/directories" + boshdirs "github.com/cloudfoundry/bosh-agent/v2/settings/directories" boshassert "github.com/cloudfoundry/bosh-utils/assert" fakecmd "github.com/cloudfoundry/bosh-utils/fileutil/fakes" diff --git a/agent/logstarprovider/logstarproviderfakes/fake_logs_tar_provider.go b/agent/logstarprovider/logstarproviderfakes/fake_logs_tar_provider.go index 9bcb44804..79b63468a 100644 --- a/agent/logstarprovider/logstarproviderfakes/fake_logs_tar_provider.go +++ b/agent/logstarprovider/logstarproviderfakes/fake_logs_tar_provider.go @@ -4,7 +4,7 @@ package logstarproviderfakes import ( "sync" - "github.com/cloudfoundry/bosh-agent/agent/logstarprovider" + "github.com/cloudfoundry/bosh-agent/v2/agent/logstarprovider" ) type FakeLogsTarProvider struct { diff --git a/agent/script/cmd/build_command_unix.go b/agent/script/cmd/build_command_unix.go index f272509b3..a9aad716e 100644 --- a/agent/script/cmd/build_command_unix.go +++ b/agent/script/cmd/build_command_unix.go @@ -4,7 +4,7 @@ package cmd import ( - boshenv "github.com/cloudfoundry/bosh-agent/agent/script/pathenv" + boshenv "github.com/cloudfoundry/bosh-agent/v2/agent/script/pathenv" boshsys "github.com/cloudfoundry/bosh-utils/system" ) diff --git a/agent/script/cmd/build_command_windows.go b/agent/script/cmd/build_command_windows.go index a0c925424..60e4e78f7 100644 --- a/agent/script/cmd/build_command_windows.go +++ b/agent/script/cmd/build_command_windows.go @@ -1,7 +1,7 @@ package cmd import ( - boshenv "github.com/cloudfoundry/bosh-agent/agent/script/pathenv" + boshenv "github.com/cloudfoundry/bosh-agent/v2/agent/script/pathenv" boshsys "github.com/cloudfoundry/bosh-utils/system" ) diff --git a/agent/script/concrete_job_script_provider.go b/agent/script/concrete_job_script_provider.go index 2bcc13ce0..2216b90e8 100644 --- a/agent/script/concrete_job_script_provider.go +++ b/agent/script/concrete_job_script_provider.go @@ -7,8 +7,8 @@ import ( "code.cloudfoundry.org/clock" - boshdrain "github.com/cloudfoundry/bosh-agent/agent/script/drain" - boshdir "github.com/cloudfoundry/bosh-agent/settings/directories" + boshdrain "github.com/cloudfoundry/bosh-agent/v2/agent/script/drain" + boshdir "github.com/cloudfoundry/bosh-agent/v2/settings/directories" boshlog "github.com/cloudfoundry/bosh-utils/logger" boshsys "github.com/cloudfoundry/bosh-utils/system" ) diff --git a/agent/script/concrete_job_script_provider_test.go b/agent/script/concrete_job_script_provider_test.go index 8e75ea4dc..9d40f6b64 100644 --- a/agent/script/concrete_job_script_provider_test.go +++ b/agent/script/concrete_job_script_provider_test.go @@ -4,12 +4,12 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - fakeaction "github.com/cloudfoundry/bosh-agent/agent/action/fakes" - boshscript "github.com/cloudfoundry/bosh-agent/agent/script" - boshdrain "github.com/cloudfoundry/bosh-agent/agent/script/drain" - "github.com/cloudfoundry/bosh-agent/agent/script/drain/drainfakes" - "github.com/cloudfoundry/bosh-agent/agent/script/scriptfakes" - boshdir "github.com/cloudfoundry/bosh-agent/settings/directories" + fakeaction "github.com/cloudfoundry/bosh-agent/v2/agent/action/fakes" + boshscript "github.com/cloudfoundry/bosh-agent/v2/agent/script" + boshdrain "github.com/cloudfoundry/bosh-agent/v2/agent/script/drain" + "github.com/cloudfoundry/bosh-agent/v2/agent/script/drain/drainfakes" + "github.com/cloudfoundry/bosh-agent/v2/agent/script/scriptfakes" + boshdir "github.com/cloudfoundry/bosh-agent/v2/settings/directories" boshassert "github.com/cloudfoundry/bosh-utils/assert" boshlog "github.com/cloudfoundry/bosh-utils/logger" fakesys "github.com/cloudfoundry/bosh-utils/system/fakes" diff --git a/agent/script/drain/concrete_script.go b/agent/script/drain/concrete_script.go index cc029ff28..06c23ae98 100644 --- a/agent/script/drain/concrete_script.go +++ b/agent/script/drain/concrete_script.go @@ -6,7 +6,7 @@ import ( "time" "code.cloudfoundry.org/clock" - "github.com/cloudfoundry/bosh-agent/agent/script/cmd" + "github.com/cloudfoundry/bosh-agent/v2/agent/script/cmd" bosherr "github.com/cloudfoundry/bosh-utils/errors" boshlog "github.com/cloudfoundry/bosh-utils/logger" boshsys "github.com/cloudfoundry/bosh-utils/system" diff --git a/agent/script/drain/concrete_script_test.go b/agent/script/drain/concrete_script_test.go index af9770590..006081dd9 100644 --- a/agent/script/drain/concrete_script_test.go +++ b/agent/script/drain/concrete_script_test.go @@ -9,11 +9,11 @@ import ( "runtime" - fakeaction "github.com/cloudfoundry/bosh-agent/agent/action/fakes" - "github.com/cloudfoundry/bosh-agent/agent/applier/applyspec" - . "github.com/cloudfoundry/bosh-agent/agent/script/drain" - "github.com/cloudfoundry/bosh-agent/agent/script/drain/drainfakes" - boshenv "github.com/cloudfoundry/bosh-agent/agent/script/pathenv" + fakeaction "github.com/cloudfoundry/bosh-agent/v2/agent/action/fakes" + "github.com/cloudfoundry/bosh-agent/v2/agent/applier/applyspec" + . "github.com/cloudfoundry/bosh-agent/v2/agent/script/drain" + "github.com/cloudfoundry/bosh-agent/v2/agent/script/drain/drainfakes" + boshenv "github.com/cloudfoundry/bosh-agent/v2/agent/script/pathenv" "github.com/cloudfoundry/bosh-utils/crypto" boshlog "github.com/cloudfoundry/bosh-utils/logger" boshsys "github.com/cloudfoundry/bosh-utils/system" diff --git a/agent/script/drain/drainfakes/fake_script_params.go b/agent/script/drain/drainfakes/fake_script_params.go index 5f35133ba..1c9ae6c56 100644 --- a/agent/script/drain/drainfakes/fake_script_params.go +++ b/agent/script/drain/drainfakes/fake_script_params.go @@ -4,7 +4,7 @@ package drainfakes import ( "sync" - "github.com/cloudfoundry/bosh-agent/agent/script/drain" + "github.com/cloudfoundry/bosh-agent/v2/agent/script/drain" ) type FakeScriptParams struct { diff --git a/agent/script/drain/presented_job_state.go b/agent/script/drain/presented_job_state.go index d19101de8..a704cf608 100644 --- a/agent/script/drain/presented_job_state.go +++ b/agent/script/drain/presented_job_state.go @@ -3,7 +3,7 @@ package drain import ( "encoding/json" - boshas "github.com/cloudfoundry/bosh-agent/agent/applier/applyspec" + boshas "github.com/cloudfoundry/bosh-agent/v2/agent/applier/applyspec" bosherr "github.com/cloudfoundry/bosh-utils/errors" ) diff --git a/agent/script/drain/script_params.go b/agent/script/drain/script_params.go index 4c3faa495..3c0cfe071 100644 --- a/agent/script/drain/script_params.go +++ b/agent/script/drain/script_params.go @@ -3,7 +3,7 @@ package drain import ( "sort" - boshas "github.com/cloudfoundry/bosh-agent/agent/applier/applyspec" + boshas "github.com/cloudfoundry/bosh-agent/v2/agent/applier/applyspec" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . ScriptParams diff --git a/agent/script/drain/script_params_test.go b/agent/script/drain/script_params_test.go index 9ea3dc96e..759d93964 100644 --- a/agent/script/drain/script_params_test.go +++ b/agent/script/drain/script_params_test.go @@ -4,8 +4,8 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - boshas "github.com/cloudfoundry/bosh-agent/agent/applier/applyspec" - . "github.com/cloudfoundry/bosh-agent/agent/script/drain" + boshas "github.com/cloudfoundry/bosh-agent/v2/agent/applier/applyspec" + . "github.com/cloudfoundry/bosh-agent/v2/agent/script/drain" "github.com/cloudfoundry/bosh-utils/crypto" ) diff --git a/agent/script/generic_script.go b/agent/script/generic_script.go index 894cd7555..eff7486b6 100644 --- a/agent/script/generic_script.go +++ b/agent/script/generic_script.go @@ -4,7 +4,7 @@ import ( "os" "path/filepath" - "github.com/cloudfoundry/bosh-agent/agent/script/cmd" + "github.com/cloudfoundry/bosh-agent/v2/agent/script/cmd" boshsys "github.com/cloudfoundry/bosh-utils/system" ) diff --git a/agent/script/generic_script_test.go b/agent/script/generic_script_test.go index acde69ead..b9cdae51d 100644 --- a/agent/script/generic_script_test.go +++ b/agent/script/generic_script_test.go @@ -9,8 +9,8 @@ import ( "runtime" - boshscript "github.com/cloudfoundry/bosh-agent/agent/script" - boshenv "github.com/cloudfoundry/bosh-agent/agent/script/pathenv" + boshscript "github.com/cloudfoundry/bosh-agent/v2/agent/script" + boshenv "github.com/cloudfoundry/bosh-agent/v2/agent/script/pathenv" fakesys "github.com/cloudfoundry/bosh-utils/system/fakes" ) diff --git a/agent/script/parallel_script_test.go b/agent/script/parallel_script_test.go index 7957b8e4b..9b8514d1b 100644 --- a/agent/script/parallel_script_test.go +++ b/agent/script/parallel_script_test.go @@ -8,8 +8,8 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - boshscript "github.com/cloudfoundry/bosh-agent/agent/script" - "github.com/cloudfoundry/bosh-agent/agent/script/scriptfakes" + boshscript "github.com/cloudfoundry/bosh-agent/v2/agent/script" + "github.com/cloudfoundry/bosh-agent/v2/agent/script/scriptfakes" boshlog "github.com/cloudfoundry/bosh-utils/logger" ) diff --git a/agent/script/script_interface.go b/agent/script/script_interface.go index 1ddc45aba..a4efc77d1 100644 --- a/agent/script/script_interface.go +++ b/agent/script/script_interface.go @@ -1,7 +1,7 @@ package script import ( - boshdrain "github.com/cloudfoundry/bosh-agent/agent/script/drain" + boshdrain "github.com/cloudfoundry/bosh-agent/v2/agent/script/drain" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 -generate diff --git a/agent/script/scriptfakes/fake_cancellable_script.go b/agent/script/scriptfakes/fake_cancellable_script.go index fad741d52..1e3901835 100644 --- a/agent/script/scriptfakes/fake_cancellable_script.go +++ b/agent/script/scriptfakes/fake_cancellable_script.go @@ -4,7 +4,7 @@ package scriptfakes import ( "sync" - "github.com/cloudfoundry/bosh-agent/agent/script" + "github.com/cloudfoundry/bosh-agent/v2/agent/script" ) type FakeCancellableScript struct { diff --git a/agent/script/scriptfakes/fake_job_script_provider.go b/agent/script/scriptfakes/fake_job_script_provider.go index e9816dd6b..4bc8e720f 100644 --- a/agent/script/scriptfakes/fake_job_script_provider.go +++ b/agent/script/scriptfakes/fake_job_script_provider.go @@ -4,8 +4,8 @@ package scriptfakes import ( "sync" - "github.com/cloudfoundry/bosh-agent/agent/script" - "github.com/cloudfoundry/bosh-agent/agent/script/drain" + "github.com/cloudfoundry/bosh-agent/v2/agent/script" + "github.com/cloudfoundry/bosh-agent/v2/agent/script/drain" ) type FakeJobScriptProvider struct { diff --git a/agent/script/scriptfakes/fake_script.go b/agent/script/scriptfakes/fake_script.go index 4e5f9ad38..80c15d00d 100644 --- a/agent/script/scriptfakes/fake_script.go +++ b/agent/script/scriptfakes/fake_script.go @@ -4,7 +4,7 @@ package scriptfakes import ( "sync" - "github.com/cloudfoundry/bosh-agent/agent/script" + "github.com/cloudfoundry/bosh-agent/v2/agent/script" ) type FakeScript struct { diff --git a/agent/tarpath/detector_test.go b/agent/tarpath/detector_test.go index 65a7086d3..71169af4d 100644 --- a/agent/tarpath/detector_test.go +++ b/agent/tarpath/detector_test.go @@ -9,7 +9,7 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/cloudfoundry/bosh-agent/agent/tarpath" + "github.com/cloudfoundry/bosh-agent/v2/agent/tarpath" ) var _ = Describe("path prefix detection", func() { diff --git a/agent/tarpath/tarpathfakes/fake_detector.go b/agent/tarpath/tarpathfakes/fake_detector.go index 92afc2e14..16dd5de75 100644 --- a/agent/tarpath/tarpathfakes/fake_detector.go +++ b/agent/tarpath/tarpathfakes/fake_detector.go @@ -4,7 +4,7 @@ package tarpathfakes import ( "sync" - "github.com/cloudfoundry/bosh-agent/agent/tarpath" + "github.com/cloudfoundry/bosh-agent/v2/agent/tarpath" ) type FakeDetector struct { diff --git a/agent/task/async_task_service_test.go b/agent/task/async_task_service_test.go index 799baf9e4..d17f27280 100644 --- a/agent/task/async_task_service_test.go +++ b/agent/task/async_task_service_test.go @@ -8,7 +8,7 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/cloudfoundry/bosh-agent/agent/task" + . "github.com/cloudfoundry/bosh-agent/v2/agent/task" boshlog "github.com/cloudfoundry/bosh-utils/logger" fakeuuid "github.com/cloudfoundry/bosh-utils/uuid/fakes" ) diff --git a/agent/task/concrete_manager_test.go b/agent/task/concrete_manager_test.go index 95f97ea4c..dda982451 100644 --- a/agent/task/concrete_manager_test.go +++ b/agent/task/concrete_manager_test.go @@ -7,7 +7,7 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - boshtask "github.com/cloudfoundry/bosh-agent/agent/task" + boshtask "github.com/cloudfoundry/bosh-agent/v2/agent/task" boshlog "github.com/cloudfoundry/bosh-utils/logger" fakesys "github.com/cloudfoundry/bosh-utils/system/fakes" ) diff --git a/agent/task/fakes/fake_manager.go b/agent/task/fakes/fake_manager.go index 1d8a122cc..09ecc7ec6 100644 --- a/agent/task/fakes/fake_manager.go +++ b/agent/task/fakes/fake_manager.go @@ -1,6 +1,6 @@ package fakes -import boshtask "github.com/cloudfoundry/bosh-agent/agent/task" +import boshtask "github.com/cloudfoundry/bosh-agent/v2/agent/task" type FakeManager struct { taskIDToTaskInfo map[string]boshtask.Info diff --git a/agent/task/fakes/fake_service.go b/agent/task/fakes/fake_service.go index 0eb973f97..b64ca8f32 100644 --- a/agent/task/fakes/fake_service.go +++ b/agent/task/fakes/fake_service.go @@ -1,7 +1,7 @@ package fakes import ( - boshtask "github.com/cloudfoundry/bosh-agent/agent/task" + boshtask "github.com/cloudfoundry/bosh-agent/v2/agent/task" ) type FakeService struct { diff --git a/agent/task/task_test.go b/agent/task/task_test.go index 8bffb0e9f..d37347902 100644 --- a/agent/task/task_test.go +++ b/agent/task/task_test.go @@ -6,7 +6,7 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/cloudfoundry/bosh-agent/agent/task" + . "github.com/cloudfoundry/bosh-agent/v2/agent/task" ) var _ = Describe("Task", func() { diff --git a/agent/utils/utilsfakes/fake_killer.go b/agent/utils/utilsfakes/fake_killer.go index 8ff44dfaa..391671cb5 100644 --- a/agent/utils/utilsfakes/fake_killer.go +++ b/agent/utils/utilsfakes/fake_killer.go @@ -4,7 +4,7 @@ package utilsfakes import ( "sync" - "github.com/cloudfoundry/bosh-agent/agent/utils" + "github.com/cloudfoundry/bosh-agent/v2/agent/utils" ) type FakeKiller struct { diff --git a/agentclient/agent_client_interface.go b/agentclient/agent_client_interface.go index 9f7b35b5b..cfb6dc0fd 100644 --- a/agentclient/agent_client_interface.go +++ b/agentclient/agent_client_interface.go @@ -1,6 +1,6 @@ package agentclient -import "github.com/cloudfoundry/bosh-agent/agentclient/applyspec" +import "github.com/cloudfoundry/bosh-agent/v2/agentclient/applyspec" //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 -o fakes/fake_agent_client.go . AgentClient diff --git a/agentclient/applyspec/apply_spec_test.go b/agentclient/applyspec/apply_spec_test.go index 7ec8461fe..883e03eb8 100644 --- a/agentclient/applyspec/apply_spec_test.go +++ b/agentclient/applyspec/apply_spec_test.go @@ -3,7 +3,7 @@ package applyspec_test import ( "encoding/json" - . "github.com/cloudfoundry/bosh-agent/agentclient/applyspec" + . "github.com/cloudfoundry/bosh-agent/v2/agentclient/applyspec" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/agentclient/fakes/fake_agent_client.go b/agentclient/fakes/fake_agent_client.go index c22ebd6ef..ff6862760 100644 --- a/agentclient/fakes/fake_agent_client.go +++ b/agentclient/fakes/fake_agent_client.go @@ -4,8 +4,8 @@ package fakes import ( "sync" - "github.com/cloudfoundry/bosh-agent/agentclient" - "github.com/cloudfoundry/bosh-agent/agentclient/applyspec" + "github.com/cloudfoundry/bosh-agent/v2/agentclient" + "github.com/cloudfoundry/bosh-agent/v2/agentclient/applyspec" ) type FakeAgentClient struct { diff --git a/agentclient/get_state_retryable_test.go b/agentclient/get_state_retryable_test.go index 24a5e9c01..c788e29a5 100644 --- a/agentclient/get_state_retryable_test.go +++ b/agentclient/get_state_retryable_test.go @@ -3,8 +3,8 @@ package agentclient_test import ( "errors" - . "github.com/cloudfoundry/bosh-agent/agentclient" - fakeagentclient "github.com/cloudfoundry/bosh-agent/agentclient/fakes" + . "github.com/cloudfoundry/bosh-agent/v2/agentclient" + fakeagentclient "github.com/cloudfoundry/bosh-agent/v2/agentclient/fakes" boshretry "github.com/cloudfoundry/bosh-utils/retrystrategy" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/agentclient/http/agent_client.go b/agentclient/http/agent_client.go index 714405053..da48a80e9 100644 --- a/agentclient/http/agent_client.go +++ b/agentclient/http/agent_client.go @@ -10,8 +10,8 @@ import ( boshlog "github.com/cloudfoundry/bosh-utils/logger" boshretry "github.com/cloudfoundry/bosh-utils/retrystrategy" - "github.com/cloudfoundry/bosh-agent/agentclient" - "github.com/cloudfoundry/bosh-agent/agentclient/applyspec" + "github.com/cloudfoundry/bosh-agent/v2/agentclient" + "github.com/cloudfoundry/bosh-agent/v2/agentclient/applyspec" ) type AgentClient struct { diff --git a/agentclient/http/agent_client_factory.go b/agentclient/http/agent_client_factory.go index 6fd7ca20f..1132503b8 100644 --- a/agentclient/http/agent_client_factory.go +++ b/agentclient/http/agent_client_factory.go @@ -5,7 +5,7 @@ package http import ( "time" - "github.com/cloudfoundry/bosh-agent/agentclient" + "github.com/cloudfoundry/bosh-agent/v2/agentclient" "github.com/cloudfoundry/bosh-utils/crypto" "github.com/cloudfoundry/bosh-utils/httpclient" boshlog "github.com/cloudfoundry/bosh-utils/logger" diff --git a/agentclient/http/agent_client_factory_test.go b/agentclient/http/agent_client_factory_test.go index 6cd3c6e0a..bc4fd428e 100644 --- a/agentclient/http/agent_client_factory_test.go +++ b/agentclient/http/agent_client_factory_test.go @@ -3,7 +3,7 @@ package http_test import ( "time" - "github.com/cloudfoundry/bosh-agent/agentclient/http" + "github.com/cloudfoundry/bosh-agent/v2/agentclient/http" boshlog "github.com/cloudfoundry/bosh-utils/logger" . "github.com/onsi/ginkgo/v2" diff --git a/agentclient/http/agent_client_test.go b/agentclient/http/agent_client_test.go index 07ac9a5da..1b28e3d5b 100644 --- a/agentclient/http/agent_client_test.go +++ b/agentclient/http/agent_client_test.go @@ -9,10 +9,10 @@ import ( . "github.com/onsi/gomega" "github.com/onsi/gomega/ghttp" - . "github.com/cloudfoundry/bosh-agent/agentclient/http" + . "github.com/cloudfoundry/bosh-agent/v2/agentclient/http" - "github.com/cloudfoundry/bosh-agent/agentclient" - "github.com/cloudfoundry/bosh-agent/agentclient/applyspec" + "github.com/cloudfoundry/bosh-agent/v2/agentclient" + "github.com/cloudfoundry/bosh-agent/v2/agentclient/applyspec" "github.com/cloudfoundry/bosh-utils/httpclient" boshlog "github.com/cloudfoundry/bosh-utils/logger" diff --git a/agentclient/http/agent_response.go b/agentclient/http/agent_response.go index dcf293f71..03629b9d1 100644 --- a/agentclient/http/agent_response.go +++ b/agentclient/http/agent_response.go @@ -6,7 +6,7 @@ import ( bosherr "github.com/cloudfoundry/bosh-utils/errors" - "github.com/cloudfoundry/bosh-agent/agentclient" + "github.com/cloudfoundry/bosh-agent/v2/agentclient" ) type Response interface { diff --git a/agentclient/http/agent_response_test.go b/agentclient/http/agent_response_test.go index 247ef5704..597d9fc8d 100644 --- a/agentclient/http/agent_response_test.go +++ b/agentclient/http/agent_response_test.go @@ -1,7 +1,7 @@ package http_test import ( - . "github.com/cloudfoundry/bosh-agent/agentclient/http" + . "github.com/cloudfoundry/bosh-agent/v2/agentclient/http" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/agentclient/http/fakes/fake_agent_client_factory.go b/agentclient/http/fakes/fake_agent_client_factory.go index e5a6663ac..ae891ea3f 100644 --- a/agentclient/http/fakes/fake_agent_client_factory.go +++ b/agentclient/http/fakes/fake_agent_client_factory.go @@ -1,7 +1,7 @@ package fakes import ( - "github.com/cloudfoundry/bosh-agent/agentclient" + "github.com/cloudfoundry/bosh-agent/v2/agentclient" ) type FakeAgentClientFactory struct { diff --git a/agentclient/http/mocks/mocks.go b/agentclient/http/mocks/mocks.go index fe5171316..eb90a6323 100644 --- a/agentclient/http/mocks/mocks.go +++ b/agentclient/http/mocks/mocks.go @@ -7,7 +7,7 @@ package mocks import ( reflect "reflect" - agentclient "github.com/cloudfoundry/bosh-agent/agentclient" + agentclient "github.com/cloudfoundry/bosh-agent/v2/agentclient" gomock "github.com/golang/mock/gomock" ) diff --git a/agentclient/ping_retryable_test.go b/agentclient/ping_retryable_test.go index adeae65dc..564096bf3 100644 --- a/agentclient/ping_retryable_test.go +++ b/agentclient/ping_retryable_test.go @@ -5,8 +5,8 @@ import ( "crypto/x509" - . "github.com/cloudfoundry/bosh-agent/agentclient" - fakeagentclient "github.com/cloudfoundry/bosh-agent/agentclient/fakes" + . "github.com/cloudfoundry/bosh-agent/v2/agentclient" + fakeagentclient "github.com/cloudfoundry/bosh-agent/v2/agentclient/fakes" bosherr "github.com/cloudfoundry/bosh-utils/errors" boshretry "github.com/cloudfoundry/bosh-utils/retrystrategy" . "github.com/onsi/ginkgo/v2" diff --git a/app/app.go b/app/app.go index 45de6a52e..d8c53848e 100644 --- a/app/app.go +++ b/app/app.go @@ -9,30 +9,30 @@ import ( "os" - boshagent "github.com/cloudfoundry/bosh-agent/agent" - boshaction "github.com/cloudfoundry/bosh-agent/agent/action" - boshapplier "github.com/cloudfoundry/bosh-agent/agent/applier" - boshas "github.com/cloudfoundry/bosh-agent/agent/applier/applyspec" - boshbc "github.com/cloudfoundry/bosh-agent/agent/applier/bundlecollection" - boshaj "github.com/cloudfoundry/bosh-agent/agent/applier/jobs" - boshap "github.com/cloudfoundry/bosh-agent/agent/applier/packages" - boshagentblobstore "github.com/cloudfoundry/bosh-agent/agent/blobstore" - "github.com/cloudfoundry/bosh-agent/agent/bootonce" - boshrunner "github.com/cloudfoundry/bosh-agent/agent/cmdrunner" - boshcomp "github.com/cloudfoundry/bosh-agent/agent/compiler" - httpblobprovider "github.com/cloudfoundry/bosh-agent/agent/httpblobprovider" - "github.com/cloudfoundry/bosh-agent/agent/httpblobprovider/blobstore_delegator" - boshscript "github.com/cloudfoundry/bosh-agent/agent/script" - boshtask "github.com/cloudfoundry/bosh-agent/agent/task" - boshinf "github.com/cloudfoundry/bosh-agent/infrastructure" - boshjobsuper "github.com/cloudfoundry/bosh-agent/jobsupervisor" - boshmonit "github.com/cloudfoundry/bosh-agent/jobsupervisor/monit" - boshmbus "github.com/cloudfoundry/bosh-agent/mbus" - boshnotif "github.com/cloudfoundry/bosh-agent/notification" - boshplatform "github.com/cloudfoundry/bosh-agent/platform" - boshsettings "github.com/cloudfoundry/bosh-agent/settings" - boshdirs "github.com/cloudfoundry/bosh-agent/settings/directories" - boshsigar "github.com/cloudfoundry/bosh-agent/sigar" + boshagent "github.com/cloudfoundry/bosh-agent/v2/agent" + boshaction "github.com/cloudfoundry/bosh-agent/v2/agent/action" + boshapplier "github.com/cloudfoundry/bosh-agent/v2/agent/applier" + boshas "github.com/cloudfoundry/bosh-agent/v2/agent/applier/applyspec" + boshbc "github.com/cloudfoundry/bosh-agent/v2/agent/applier/bundlecollection" + boshaj "github.com/cloudfoundry/bosh-agent/v2/agent/applier/jobs" + boshap "github.com/cloudfoundry/bosh-agent/v2/agent/applier/packages" + boshagentblobstore "github.com/cloudfoundry/bosh-agent/v2/agent/blobstore" + "github.com/cloudfoundry/bosh-agent/v2/agent/bootonce" + boshrunner "github.com/cloudfoundry/bosh-agent/v2/agent/cmdrunner" + boshcomp "github.com/cloudfoundry/bosh-agent/v2/agent/compiler" + httpblobprovider "github.com/cloudfoundry/bosh-agent/v2/agent/httpblobprovider" + "github.com/cloudfoundry/bosh-agent/v2/agent/httpblobprovider/blobstore_delegator" + boshscript "github.com/cloudfoundry/bosh-agent/v2/agent/script" + boshtask "github.com/cloudfoundry/bosh-agent/v2/agent/task" + boshinf "github.com/cloudfoundry/bosh-agent/v2/infrastructure" + boshjobsuper "github.com/cloudfoundry/bosh-agent/v2/jobsupervisor" + boshmonit "github.com/cloudfoundry/bosh-agent/v2/jobsupervisor/monit" + boshmbus "github.com/cloudfoundry/bosh-agent/v2/mbus" + boshnotif "github.com/cloudfoundry/bosh-agent/v2/notification" + boshplatform "github.com/cloudfoundry/bosh-agent/v2/platform" + boshsettings "github.com/cloudfoundry/bosh-agent/v2/settings" + boshdirs "github.com/cloudfoundry/bosh-agent/v2/settings/directories" + boshsigar "github.com/cloudfoundry/bosh-agent/v2/sigar" boshblob "github.com/cloudfoundry/bosh-utils/blobstore" bosherr "github.com/cloudfoundry/bosh-utils/errors" boshlog "github.com/cloudfoundry/bosh-utils/logger" diff --git a/app/app_test.go b/app/app_test.go index 5cae922b0..71c72ec01 100644 --- a/app/app_test.go +++ b/app/app_test.go @@ -7,8 +7,8 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/cloudfoundry/bosh-agent/infrastructure/devicepathresolver" - boshdirs "github.com/cloudfoundry/bosh-agent/settings/directories" + "github.com/cloudfoundry/bosh-agent/v2/infrastructure/devicepathresolver" + boshdirs "github.com/cloudfoundry/bosh-agent/v2/settings/directories" boshlog "github.com/cloudfoundry/bosh-utils/logger" "github.com/cloudfoundry/bosh-utils/logger/loggerfakes" boshsys "github.com/cloudfoundry/bosh-utils/system" diff --git a/app/config.go b/app/config.go index 3d07f0f47..45a4708cc 100644 --- a/app/config.go +++ b/app/config.go @@ -3,8 +3,8 @@ package app import ( "encoding/json" - boshinf "github.com/cloudfoundry/bosh-agent/infrastructure" - boshplatform "github.com/cloudfoundry/bosh-agent/platform" + boshinf "github.com/cloudfoundry/bosh-agent/v2/infrastructure" + boshplatform "github.com/cloudfoundry/bosh-agent/v2/platform" bosherr "github.com/cloudfoundry/bosh-utils/errors" boshsys "github.com/cloudfoundry/bosh-utils/system" ) diff --git a/app/config_test.go b/app/config_test.go index 29e75203d..337daf43d 100644 --- a/app/config_test.go +++ b/app/config_test.go @@ -4,8 +4,8 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - boshinf "github.com/cloudfoundry/bosh-agent/infrastructure" - boshplatform "github.com/cloudfoundry/bosh-agent/platform" + boshinf "github.com/cloudfoundry/bosh-agent/v2/infrastructure" + boshplatform "github.com/cloudfoundry/bosh-agent/v2/platform" fakesys "github.com/cloudfoundry/bosh-utils/system/fakes" ) diff --git a/factory/factory.go b/factory/factory.go index 463bbf996..31be9f64a 100644 --- a/factory/factory.go +++ b/factory/factory.go @@ -1,7 +1,7 @@ package factory import ( - settings "github.com/cloudfoundry/bosh-agent/settings" + settings "github.com/cloudfoundry/bosh-agent/v2/settings" ) type Network struct { diff --git a/go.mod b/go.mod index 42b2e1dc8..682770803 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/cloudfoundry/bosh-agent +module github.com/cloudfoundry/bosh-agent/v2 go 1.22.0 diff --git a/handler/common_event_format_test.go b/handler/common_event_format_test.go index ac42c76d5..cbb0f6acb 100644 --- a/handler/common_event_format_test.go +++ b/handler/common_event_format_test.go @@ -4,7 +4,7 @@ import ( "net/http" "net/http/httptest" - "github.com/cloudfoundry/bosh-agent/handler" + "github.com/cloudfoundry/bosh-agent/v2/handler" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/handler/response_test.go b/handler/response_test.go index 2ba4b07f6..34caf3b2a 100644 --- a/handler/response_test.go +++ b/handler/response_test.go @@ -5,7 +5,7 @@ import ( . "github.com/onsi/ginkgo/v2" - . "github.com/cloudfoundry/bosh-agent/handler" + . "github.com/cloudfoundry/bosh-agent/v2/handler" boshassert "github.com/cloudfoundry/bosh-utils/assert" ) diff --git a/infrastructure/agentlogger/signalable_logger_test.go b/infrastructure/agentlogger/signalable_logger_test.go index de3dfe3bc..6f025b177 100644 --- a/infrastructure/agentlogger/signalable_logger_test.go +++ b/infrastructure/agentlogger/signalable_logger_test.go @@ -5,7 +5,7 @@ import ( "os" "syscall" - "github.com/cloudfoundry/bosh-agent/infrastructure/agentlogger" + "github.com/cloudfoundry/bosh-agent/v2/infrastructure/agentlogger" "github.com/cloudfoundry/bosh-utils/logger" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/infrastructure/cdrom_settings_source.go b/infrastructure/cdrom_settings_source.go index 2d9878722..da43e1b67 100644 --- a/infrastructure/cdrom_settings_source.go +++ b/infrastructure/cdrom_settings_source.go @@ -3,8 +3,8 @@ package infrastructure import ( "encoding/json" - boshplatform "github.com/cloudfoundry/bosh-agent/platform" - boshsettings "github.com/cloudfoundry/bosh-agent/settings" + boshplatform "github.com/cloudfoundry/bosh-agent/v2/platform" + boshsettings "github.com/cloudfoundry/bosh-agent/v2/settings" bosherr "github.com/cloudfoundry/bosh-utils/errors" boshlog "github.com/cloudfoundry/bosh-utils/logger" ) diff --git a/infrastructure/cdrom_settings_source_test.go b/infrastructure/cdrom_settings_source_test.go index 468683b8e..b581e6ff8 100644 --- a/infrastructure/cdrom_settings_source_test.go +++ b/infrastructure/cdrom_settings_source_test.go @@ -6,8 +6,8 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/cloudfoundry/bosh-agent/infrastructure" - "github.com/cloudfoundry/bosh-agent/platform/platformfakes" + . "github.com/cloudfoundry/bosh-agent/v2/infrastructure" + "github.com/cloudfoundry/bosh-agent/v2/platform/platformfakes" boshlog "github.com/cloudfoundry/bosh-utils/logger" ) diff --git a/infrastructure/config_drive_settings_source.go b/infrastructure/config_drive_settings_source.go index 086b39c81..002efed62 100644 --- a/infrastructure/config_drive_settings_source.go +++ b/infrastructure/config_drive_settings_source.go @@ -3,8 +3,8 @@ package infrastructure import ( "encoding/json" - boshplatform "github.com/cloudfoundry/bosh-agent/platform" - boshsettings "github.com/cloudfoundry/bosh-agent/settings" + boshplatform "github.com/cloudfoundry/bosh-agent/v2/platform" + boshsettings "github.com/cloudfoundry/bosh-agent/v2/settings" bosherr "github.com/cloudfoundry/bosh-utils/errors" boshlog "github.com/cloudfoundry/bosh-utils/logger" ) diff --git a/infrastructure/config_drive_settings_source_test.go b/infrastructure/config_drive_settings_source_test.go index 90edfb17c..7662b8492 100644 --- a/infrastructure/config_drive_settings_source_test.go +++ b/infrastructure/config_drive_settings_source_test.go @@ -7,8 +7,8 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/cloudfoundry/bosh-agent/infrastructure" - "github.com/cloudfoundry/bosh-agent/platform/platformfakes" + . "github.com/cloudfoundry/bosh-agent/v2/infrastructure" + "github.com/cloudfoundry/bosh-agent/v2/platform/platformfakes" boshlog "github.com/cloudfoundry/bosh-utils/logger" ) diff --git a/infrastructure/devicepathresolver/device_path_resolver.go b/infrastructure/devicepathresolver/device_path_resolver.go index ce967abac..f8a64405e 100644 --- a/infrastructure/devicepathresolver/device_path_resolver.go +++ b/infrastructure/devicepathresolver/device_path_resolver.go @@ -1,7 +1,7 @@ package devicepathresolver import ( - boshsettings "github.com/cloudfoundry/bosh-agent/settings" + boshsettings "github.com/cloudfoundry/bosh-agent/v2/settings" ) type DevicePathResolver interface { diff --git a/infrastructure/devicepathresolver/fakes/fake_device_path_resolver.go b/infrastructure/devicepathresolver/fakes/fake_device_path_resolver.go index 35164c4df..5b0426e69 100644 --- a/infrastructure/devicepathresolver/fakes/fake_device_path_resolver.go +++ b/infrastructure/devicepathresolver/fakes/fake_device_path_resolver.go @@ -1,7 +1,7 @@ package fakes import ( - boshsettings "github.com/cloudfoundry/bosh-agent/settings" + boshsettings "github.com/cloudfoundry/bosh-agent/v2/settings" ) type FakeDevicePathResolver struct { diff --git a/infrastructure/devicepathresolver/id_device_path_resolver.go b/infrastructure/devicepathresolver/id_device_path_resolver.go index 746c51b40..39e277a20 100644 --- a/infrastructure/devicepathresolver/id_device_path_resolver.go +++ b/infrastructure/devicepathresolver/id_device_path_resolver.go @@ -6,8 +6,8 @@ import ( "regexp" "time" - boshudev "github.com/cloudfoundry/bosh-agent/platform/udevdevice" - boshsettings "github.com/cloudfoundry/bosh-agent/settings" + boshudev "github.com/cloudfoundry/bosh-agent/v2/platform/udevdevice" + boshsettings "github.com/cloudfoundry/bosh-agent/v2/settings" bosherr "github.com/cloudfoundry/bosh-utils/errors" boshsys "github.com/cloudfoundry/bosh-utils/system" ) diff --git a/infrastructure/devicepathresolver/id_device_path_resolver_test.go b/infrastructure/devicepathresolver/id_device_path_resolver_test.go index e33eb9e56..2c6ef842d 100644 --- a/infrastructure/devicepathresolver/id_device_path_resolver_test.go +++ b/infrastructure/devicepathresolver/id_device_path_resolver_test.go @@ -6,14 +6,14 @@ import ( "path/filepath" "time" - fakeudev "github.com/cloudfoundry/bosh-agent/platform/udevdevice/fakes" - boshsettings "github.com/cloudfoundry/bosh-agent/settings" + fakeudev "github.com/cloudfoundry/bosh-agent/v2/platform/udevdevice/fakes" + boshsettings "github.com/cloudfoundry/bosh-agent/v2/settings" fakesys "github.com/cloudfoundry/bosh-utils/system/fakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/cloudfoundry/bosh-agent/infrastructure/devicepathresolver" + . "github.com/cloudfoundry/bosh-agent/v2/infrastructure/devicepathresolver" ) var _ = Describe("IDDevicePathResolver", func() { diff --git a/infrastructure/devicepathresolver/identity_device_path_resolver.go b/infrastructure/devicepathresolver/identity_device_path_resolver.go index 2a6d12ebf..b9b8d24b8 100644 --- a/infrastructure/devicepathresolver/identity_device_path_resolver.go +++ b/infrastructure/devicepathresolver/identity_device_path_resolver.go @@ -1,7 +1,7 @@ package devicepathresolver import ( - boshsettings "github.com/cloudfoundry/bosh-agent/settings" + boshsettings "github.com/cloudfoundry/bosh-agent/v2/settings" bosherr "github.com/cloudfoundry/bosh-utils/errors" ) diff --git a/infrastructure/devicepathresolver/identity_device_path_resolver_test.go b/infrastructure/devicepathresolver/identity_device_path_resolver_test.go index 9fa700f1a..fcfe1256a 100644 --- a/infrastructure/devicepathresolver/identity_device_path_resolver_test.go +++ b/infrastructure/devicepathresolver/identity_device_path_resolver_test.go @@ -1,9 +1,9 @@ package devicepathresolver_test import ( - . "github.com/cloudfoundry/bosh-agent/infrastructure/devicepathresolver" + . "github.com/cloudfoundry/bosh-agent/v2/infrastructure/devicepathresolver" - boshsettings "github.com/cloudfoundry/bosh-agent/settings" + boshsettings "github.com/cloudfoundry/bosh-agent/v2/settings" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/infrastructure/devicepathresolver/iscsi_device_path_resolver.go b/infrastructure/devicepathresolver/iscsi_device_path_resolver.go index 9a61df118..210bf916b 100644 --- a/infrastructure/devicepathresolver/iscsi_device_path_resolver.go +++ b/infrastructure/devicepathresolver/iscsi_device_path_resolver.go @@ -8,9 +8,9 @@ import ( "strings" "time" - boshopeniscsi "github.com/cloudfoundry/bosh-agent/platform/openiscsi" - boshsettings "github.com/cloudfoundry/bosh-agent/settings" - boshdirs "github.com/cloudfoundry/bosh-agent/settings/directories" + boshopeniscsi "github.com/cloudfoundry/bosh-agent/v2/platform/openiscsi" + boshsettings "github.com/cloudfoundry/bosh-agent/v2/settings" + boshdirs "github.com/cloudfoundry/bosh-agent/v2/settings/directories" bosherr "github.com/cloudfoundry/bosh-utils/errors" boshlog "github.com/cloudfoundry/bosh-utils/logger" boshsys "github.com/cloudfoundry/bosh-utils/system" diff --git a/infrastructure/devicepathresolver/iscsi_device_path_resolver_test.go b/infrastructure/devicepathresolver/iscsi_device_path_resolver_test.go index c6bf526e5..b4cc9c970 100644 --- a/infrastructure/devicepathresolver/iscsi_device_path_resolver_test.go +++ b/infrastructure/devicepathresolver/iscsi_device_path_resolver_test.go @@ -9,10 +9,10 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/cloudfoundry/bosh-agent/infrastructure/devicepathresolver" - "github.com/cloudfoundry/bosh-agent/platform/openiscsi/openiscsifakes" - boshsettings "github.com/cloudfoundry/bosh-agent/settings" - boshdirs "github.com/cloudfoundry/bosh-agent/settings/directories" + . "github.com/cloudfoundry/bosh-agent/v2/infrastructure/devicepathresolver" + "github.com/cloudfoundry/bosh-agent/v2/platform/openiscsi/openiscsifakes" + boshsettings "github.com/cloudfoundry/bosh-agent/v2/settings" + boshdirs "github.com/cloudfoundry/bosh-agent/v2/settings/directories" boshlog "github.com/cloudfoundry/bosh-utils/logger" fakesys "github.com/cloudfoundry/bosh-utils/system/fakes" ) @@ -269,7 +269,7 @@ var _ = Describe("iscsiDevicePathResolver", func() { Context("when performing a disk migration", func() { BeforeEach(func() { // NOTE: this test setup is based on the traces provided in - // https://github.com/cloudfoundry/bosh-agent/issues/252#issuecomment-977712657 + // https://github.com/cloudfoundry/bosh-agent/v2/issues/252#issuecomment-977712657 dmsetupOutputForPartitionedDisk = fakesys.FakeCmdResult{Stdout: buildDmsetupOutput( []dmsetupDevice{ {Name: "3600a098038305679445d523053437757", MajMinNum: "(253:0)"}, diff --git a/infrastructure/devicepathresolver/mapped_device_path_resolver.go b/infrastructure/devicepathresolver/mapped_device_path_resolver.go index ed163fea9..37558eb8d 100644 --- a/infrastructure/devicepathresolver/mapped_device_path_resolver.go +++ b/infrastructure/devicepathresolver/mapped_device_path_resolver.go @@ -7,7 +7,7 @@ import ( "strings" "time" - boshsettings "github.com/cloudfoundry/bosh-agent/settings" + boshsettings "github.com/cloudfoundry/bosh-agent/v2/settings" bosherr "github.com/cloudfoundry/bosh-utils/errors" boshsys "github.com/cloudfoundry/bosh-utils/system" ) diff --git a/infrastructure/devicepathresolver/mapped_device_path_resolver_test.go b/infrastructure/devicepathresolver/mapped_device_path_resolver_test.go index e0e047191..284586e1d 100644 --- a/infrastructure/devicepathresolver/mapped_device_path_resolver_test.go +++ b/infrastructure/devicepathresolver/mapped_device_path_resolver_test.go @@ -9,8 +9,8 @@ import ( "errors" - . "github.com/cloudfoundry/bosh-agent/infrastructure/devicepathresolver" - boshsettings "github.com/cloudfoundry/bosh-agent/settings" + . "github.com/cloudfoundry/bosh-agent/v2/infrastructure/devicepathresolver" + boshsettings "github.com/cloudfoundry/bosh-agent/v2/settings" fakesys "github.com/cloudfoundry/bosh-utils/system/fakes" ) diff --git a/infrastructure/devicepathresolver/multipath_tool_device_path_resolver.go b/infrastructure/devicepathresolver/multipath_tool_device_path_resolver.go index 2671635b7..4eed08f8f 100644 --- a/infrastructure/devicepathresolver/multipath_tool_device_path_resolver.go +++ b/infrastructure/devicepathresolver/multipath_tool_device_path_resolver.go @@ -1,7 +1,7 @@ package devicepathresolver import ( - boshsettings "github.com/cloudfoundry/bosh-agent/settings" + boshsettings "github.com/cloudfoundry/bosh-agent/v2/settings" bosherr "github.com/cloudfoundry/bosh-utils/errors" boshlog "github.com/cloudfoundry/bosh-utils/logger" ) diff --git a/infrastructure/devicepathresolver/multipath_tool_device_path_resolver_test.go b/infrastructure/devicepathresolver/multipath_tool_device_path_resolver_test.go index 127f2e8b2..6b62af9cf 100644 --- a/infrastructure/devicepathresolver/multipath_tool_device_path_resolver_test.go +++ b/infrastructure/devicepathresolver/multipath_tool_device_path_resolver_test.go @@ -6,9 +6,9 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/cloudfoundry/bosh-agent/infrastructure/devicepathresolver" - fakedpresolv "github.com/cloudfoundry/bosh-agent/infrastructure/devicepathresolver/fakes" - boshsettings "github.com/cloudfoundry/bosh-agent/settings" + . "github.com/cloudfoundry/bosh-agent/v2/infrastructure/devicepathresolver" + fakedpresolv "github.com/cloudfoundry/bosh-agent/v2/infrastructure/devicepathresolver/fakes" + boshsettings "github.com/cloudfoundry/bosh-agent/v2/settings" boshlog "github.com/cloudfoundry/bosh-utils/logger" ) diff --git a/infrastructure/devicepathresolver/scsi_device_path_resolver.go b/infrastructure/devicepathresolver/scsi_device_path_resolver.go index 63a35a831..19c869233 100644 --- a/infrastructure/devicepathresolver/scsi_device_path_resolver.go +++ b/infrastructure/devicepathresolver/scsi_device_path_resolver.go @@ -1,7 +1,7 @@ package devicepathresolver import ( - boshsettings "github.com/cloudfoundry/bosh-agent/settings" + boshsettings "github.com/cloudfoundry/bosh-agent/v2/settings" bosherr "github.com/cloudfoundry/bosh-utils/errors" ) diff --git a/infrastructure/devicepathresolver/scsi_device_path_resolver_test.go b/infrastructure/devicepathresolver/scsi_device_path_resolver_test.go index 5ea318f89..b23a89610 100644 --- a/infrastructure/devicepathresolver/scsi_device_path_resolver_test.go +++ b/infrastructure/devicepathresolver/scsi_device_path_resolver_test.go @@ -1,13 +1,13 @@ package devicepathresolver_test import ( - fakedpresolv "github.com/cloudfoundry/bosh-agent/infrastructure/devicepathresolver/fakes" - boshsettings "github.com/cloudfoundry/bosh-agent/settings" + fakedpresolv "github.com/cloudfoundry/bosh-agent/v2/infrastructure/devicepathresolver/fakes" + boshsettings "github.com/cloudfoundry/bosh-agent/v2/settings" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/cloudfoundry/bosh-agent/infrastructure/devicepathresolver" + . "github.com/cloudfoundry/bosh-agent/v2/infrastructure/devicepathresolver" ) var _ = Describe("scsiDevicePathResolver", func() { diff --git a/infrastructure/devicepathresolver/scsi_id_device_path_resolver.go b/infrastructure/devicepathresolver/scsi_id_device_path_resolver.go index 4f4f8c6c1..f34959e46 100644 --- a/infrastructure/devicepathresolver/scsi_id_device_path_resolver.go +++ b/infrastructure/devicepathresolver/scsi_id_device_path_resolver.go @@ -4,7 +4,7 @@ import ( "strings" "time" - boshsettings "github.com/cloudfoundry/bosh-agent/settings" + boshsettings "github.com/cloudfoundry/bosh-agent/v2/settings" bosherr "github.com/cloudfoundry/bosh-utils/errors" boshlog "github.com/cloudfoundry/bosh-utils/logger" boshsys "github.com/cloudfoundry/bosh-utils/system" diff --git a/infrastructure/devicepathresolver/scsi_id_device_path_resolver_test.go b/infrastructure/devicepathresolver/scsi_id_device_path_resolver_test.go index f336091c2..9d46558cd 100644 --- a/infrastructure/devicepathresolver/scsi_id_device_path_resolver_test.go +++ b/infrastructure/devicepathresolver/scsi_id_device_path_resolver_test.go @@ -6,14 +6,14 @@ import ( "strings" "time" - boshsettings "github.com/cloudfoundry/bosh-agent/settings" + boshsettings "github.com/cloudfoundry/bosh-agent/v2/settings" boshlog "github.com/cloudfoundry/bosh-utils/logger" fakesys "github.com/cloudfoundry/bosh-utils/system/fakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/cloudfoundry/bosh-agent/infrastructure/devicepathresolver" + . "github.com/cloudfoundry/bosh-agent/v2/infrastructure/devicepathresolver" ) var _ = Describe("ScsiIDDevicePathResolver", func() { diff --git a/infrastructure/devicepathresolver/scsi_lun_device_path_resolver.go b/infrastructure/devicepathresolver/scsi_lun_device_path_resolver.go index f24aa7072..064a07c2a 100644 --- a/infrastructure/devicepathresolver/scsi_lun_device_path_resolver.go +++ b/infrastructure/devicepathresolver/scsi_lun_device_path_resolver.go @@ -7,7 +7,7 @@ import ( "strings" "time" - boshsettings "github.com/cloudfoundry/bosh-agent/settings" + boshsettings "github.com/cloudfoundry/bosh-agent/v2/settings" bosherr "github.com/cloudfoundry/bosh-utils/errors" boshlog "github.com/cloudfoundry/bosh-utils/logger" boshsys "github.com/cloudfoundry/bosh-utils/system" diff --git a/infrastructure/devicepathresolver/scsi_lun_device_path_resolver_test.go b/infrastructure/devicepathresolver/scsi_lun_device_path_resolver_test.go index f721a7ed7..1302a9e24 100644 --- a/infrastructure/devicepathresolver/scsi_lun_device_path_resolver_test.go +++ b/infrastructure/devicepathresolver/scsi_lun_device_path_resolver_test.go @@ -4,14 +4,14 @@ import ( "os" "time" - boshsettings "github.com/cloudfoundry/bosh-agent/settings" + boshsettings "github.com/cloudfoundry/bosh-agent/v2/settings" boshlog "github.com/cloudfoundry/bosh-utils/logger" fakesys "github.com/cloudfoundry/bosh-utils/system/fakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/cloudfoundry/bosh-agent/infrastructure/devicepathresolver" + . "github.com/cloudfoundry/bosh-agent/v2/infrastructure/devicepathresolver" ) var _ = Describe("SCSILunDevicePathResolver", func() { diff --git a/infrastructure/devicepathresolver/scsi_volume_id_device_path_resolver.go b/infrastructure/devicepathresolver/scsi_volume_id_device_path_resolver.go index 8a4ad1a26..96224217a 100644 --- a/infrastructure/devicepathresolver/scsi_volume_id_device_path_resolver.go +++ b/infrastructure/devicepathresolver/scsi_volume_id_device_path_resolver.go @@ -8,7 +8,7 @@ import ( bosherr "github.com/cloudfoundry/bosh-utils/errors" - boshsettings "github.com/cloudfoundry/bosh-agent/settings" + boshsettings "github.com/cloudfoundry/bosh-agent/v2/settings" boshsys "github.com/cloudfoundry/bosh-utils/system" ) diff --git a/infrastructure/devicepathresolver/scsi_volume_id_device_path_resolver_test.go b/infrastructure/devicepathresolver/scsi_volume_id_device_path_resolver_test.go index 13e34bdb9..2f78de8a6 100644 --- a/infrastructure/devicepathresolver/scsi_volume_id_device_path_resolver_test.go +++ b/infrastructure/devicepathresolver/scsi_volume_id_device_path_resolver_test.go @@ -6,10 +6,10 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - boshsettings "github.com/cloudfoundry/bosh-agent/settings" + boshsettings "github.com/cloudfoundry/bosh-agent/v2/settings" fakesys "github.com/cloudfoundry/bosh-utils/system/fakes" - . "github.com/cloudfoundry/bosh-agent/infrastructure/devicepathresolver" + . "github.com/cloudfoundry/bosh-agent/v2/infrastructure/devicepathresolver" ) var _ = Describe("SCSIVolumeIDDevicePathResolver", func() { diff --git a/infrastructure/devicepathresolver/virtio_device_path_resolver.go b/infrastructure/devicepathresolver/virtio_device_path_resolver.go index cceb59cad..dff80862a 100644 --- a/infrastructure/devicepathresolver/virtio_device_path_resolver.go +++ b/infrastructure/devicepathresolver/virtio_device_path_resolver.go @@ -1,7 +1,7 @@ package devicepathresolver import ( - boshsettings "github.com/cloudfoundry/bosh-agent/settings" + boshsettings "github.com/cloudfoundry/bosh-agent/v2/settings" bosherr "github.com/cloudfoundry/bosh-utils/errors" boshlog "github.com/cloudfoundry/bosh-utils/logger" ) diff --git a/infrastructure/devicepathresolver/virtio_device_path_resolver_test.go b/infrastructure/devicepathresolver/virtio_device_path_resolver_test.go index 4d536e494..684f3fdcf 100644 --- a/infrastructure/devicepathresolver/virtio_device_path_resolver_test.go +++ b/infrastructure/devicepathresolver/virtio_device_path_resolver_test.go @@ -3,14 +3,14 @@ package devicepathresolver_test import ( "errors" - fakedpresolv "github.com/cloudfoundry/bosh-agent/infrastructure/devicepathresolver/fakes" - boshsettings "github.com/cloudfoundry/bosh-agent/settings" + fakedpresolv "github.com/cloudfoundry/bosh-agent/v2/infrastructure/devicepathresolver/fakes" + boshsettings "github.com/cloudfoundry/bosh-agent/v2/settings" boshlog "github.com/cloudfoundry/bosh-utils/logger" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/cloudfoundry/bosh-agent/infrastructure/devicepathresolver" + . "github.com/cloudfoundry/bosh-agent/v2/infrastructure/devicepathresolver" ) var _ = Describe("VirtioDevicePathResolver", func() { diff --git a/infrastructure/dig_dns_resolver_test.go b/infrastructure/dig_dns_resolver_test.go index 4a4545658..1016d85bf 100644 --- a/infrastructure/dig_dns_resolver_test.go +++ b/infrastructure/dig_dns_resolver_test.go @@ -4,7 +4,7 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/cloudfoundry/bosh-agent/infrastructure" + . "github.com/cloudfoundry/bosh-agent/v2/infrastructure" boshlog "github.com/cloudfoundry/bosh-utils/logger" fakesys "github.com/cloudfoundry/bosh-utils/system/fakes" ) diff --git a/infrastructure/fakes/fake_metadata_service.go b/infrastructure/fakes/fake_metadata_service.go index 9f9204864..0cbb9c79e 100644 --- a/infrastructure/fakes/fake_metadata_service.go +++ b/infrastructure/fakes/fake_metadata_service.go @@ -1,7 +1,7 @@ package fakes import ( - boshsettings "github.com/cloudfoundry/bosh-agent/settings" + boshsettings "github.com/cloudfoundry/bosh-agent/v2/settings" ) type FakeMetadataService struct { diff --git a/infrastructure/fakes/fake_settings_source.go b/infrastructure/fakes/fake_settings_source.go index aa94213d8..501ece23b 100644 --- a/infrastructure/fakes/fake_settings_source.go +++ b/infrastructure/fakes/fake_settings_source.go @@ -1,7 +1,7 @@ package fakes import ( - boshsettings "github.com/cloudfoundry/bosh-agent/settings" + boshsettings "github.com/cloudfoundry/bosh-agent/v2/settings" ) type FakeSettingsSource struct { diff --git a/infrastructure/file_settings_source.go b/infrastructure/file_settings_source.go index cae4a0dbd..9a68c99a4 100644 --- a/infrastructure/file_settings_source.go +++ b/infrastructure/file_settings_source.go @@ -7,7 +7,7 @@ import ( boshlog "github.com/cloudfoundry/bosh-utils/logger" boshsys "github.com/cloudfoundry/bosh-utils/system" - boshsettings "github.com/cloudfoundry/bosh-agent/settings" + boshsettings "github.com/cloudfoundry/bosh-agent/v2/settings" ) type FileSettingsSource struct { diff --git a/infrastructure/file_settings_source_test.go b/infrastructure/file_settings_source_test.go index 2ef27d81a..2e267b455 100644 --- a/infrastructure/file_settings_source_test.go +++ b/infrastructure/file_settings_source_test.go @@ -6,8 +6,8 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/cloudfoundry/bosh-agent/infrastructure" - boshsettings "github.com/cloudfoundry/bosh-agent/settings" + "github.com/cloudfoundry/bosh-agent/v2/infrastructure" + boshsettings "github.com/cloudfoundry/bosh-agent/v2/settings" boshlog "github.com/cloudfoundry/bosh-utils/logger" fakesys "github.com/cloudfoundry/bosh-utils/system/fakes" ) diff --git a/infrastructure/http_metadata_service.go b/infrastructure/http_metadata_service.go index 98643fe0f..372f2b495 100644 --- a/infrastructure/http_metadata_service.go +++ b/infrastructure/http_metadata_service.go @@ -9,8 +9,8 @@ import ( "strings" "time" - boshplat "github.com/cloudfoundry/bosh-agent/platform" - boshsettings "github.com/cloudfoundry/bosh-agent/settings" + boshplat "github.com/cloudfoundry/bosh-agent/v2/platform" + boshsettings "github.com/cloudfoundry/bosh-agent/v2/settings" bosherr "github.com/cloudfoundry/bosh-utils/errors" "github.com/cloudfoundry/bosh-utils/httpclient" boshlog "github.com/cloudfoundry/bosh-utils/logger" diff --git a/infrastructure/http_metadata_service_test.go b/infrastructure/http_metadata_service_test.go index b687331d9..640826184 100644 --- a/infrastructure/http_metadata_service_test.go +++ b/infrastructure/http_metadata_service_test.go @@ -7,15 +7,15 @@ import ( "net/http" "net/http/httptest" - . "github.com/cloudfoundry/bosh-agent/infrastructure" + . "github.com/cloudfoundry/bosh-agent/v2/infrastructure" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/cloudfoundry/bosh-agent/platform/platformfakes" + "github.com/cloudfoundry/bosh-agent/v2/platform/platformfakes" - fakeinf "github.com/cloudfoundry/bosh-agent/infrastructure/fakes" + fakeinf "github.com/cloudfoundry/bosh-agent/v2/infrastructure/fakes" - boshsettings "github.com/cloudfoundry/bosh-agent/settings" + boshsettings "github.com/cloudfoundry/bosh-agent/v2/settings" boshlog "github.com/cloudfoundry/bosh-utils/logger" ) diff --git a/infrastructure/instance_metadata_settings_source.go b/infrastructure/instance_metadata_settings_source.go index d91d9cbde..16f56811d 100644 --- a/infrastructure/instance_metadata_settings_source.go +++ b/infrastructure/instance_metadata_settings_source.go @@ -5,8 +5,8 @@ import ( "fmt" "time" - boshplatform "github.com/cloudfoundry/bosh-agent/platform" - boshsettings "github.com/cloudfoundry/bosh-agent/settings" + boshplatform "github.com/cloudfoundry/bosh-agent/v2/platform" + boshsettings "github.com/cloudfoundry/bosh-agent/v2/settings" bosherr "github.com/cloudfoundry/bosh-utils/errors" boshlog "github.com/cloudfoundry/bosh-utils/logger" ) diff --git a/infrastructure/instance_metadata_settings_source_test.go b/infrastructure/instance_metadata_settings_source_test.go index e52adcec2..effd03f04 100644 --- a/infrastructure/instance_metadata_settings_source_test.go +++ b/infrastructure/instance_metadata_settings_source_test.go @@ -7,8 +7,8 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/cloudfoundry/bosh-agent/infrastructure" - "github.com/cloudfoundry/bosh-agent/platform/platformfakes" + "github.com/cloudfoundry/bosh-agent/v2/infrastructure" + "github.com/cloudfoundry/bosh-agent/v2/platform/platformfakes" boshlog "github.com/cloudfoundry/bosh-utils/logger" ) diff --git a/infrastructure/metadata_service_interface.go b/infrastructure/metadata_service_interface.go index e58187d08..dd565fbdb 100644 --- a/infrastructure/metadata_service_interface.go +++ b/infrastructure/metadata_service_interface.go @@ -1,7 +1,7 @@ package infrastructure import ( - boshsettings "github.com/cloudfoundry/bosh-agent/settings" + boshsettings "github.com/cloudfoundry/bosh-agent/v2/settings" ) type MetadataService interface { diff --git a/infrastructure/multi_settings_source.go b/infrastructure/multi_settings_source.go index 0afb0955b..2426df995 100644 --- a/infrastructure/multi_settings_source.go +++ b/infrastructure/multi_settings_source.go @@ -1,7 +1,7 @@ package infrastructure import ( - boshsettings "github.com/cloudfoundry/bosh-agent/settings" + boshsettings "github.com/cloudfoundry/bosh-agent/v2/settings" bosherr "github.com/cloudfoundry/bosh-utils/errors" ) diff --git a/infrastructure/multi_settings_source_test.go b/infrastructure/multi_settings_source_test.go index 868e38751..41f4347c3 100644 --- a/infrastructure/multi_settings_source_test.go +++ b/infrastructure/multi_settings_source_test.go @@ -6,9 +6,9 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/cloudfoundry/bosh-agent/infrastructure" - fakeinf "github.com/cloudfoundry/bosh-agent/infrastructure/fakes" - boshsettings "github.com/cloudfoundry/bosh-agent/settings" + "github.com/cloudfoundry/bosh-agent/v2/infrastructure" + fakeinf "github.com/cloudfoundry/bosh-agent/v2/infrastructure/fakes" + boshsettings "github.com/cloudfoundry/bosh-agent/v2/settings" ) var _ = Describe("MultiSettingsSource", func() { diff --git a/infrastructure/settings_source_factory.go b/infrastructure/settings_source_factory.go index ba1a63e89..fdab96b90 100644 --- a/infrastructure/settings_source_factory.go +++ b/infrastructure/settings_source_factory.go @@ -5,8 +5,8 @@ import ( mapstruc "github.com/mitchellh/mapstructure" - boshplat "github.com/cloudfoundry/bosh-agent/platform" - boshsettings "github.com/cloudfoundry/bosh-agent/settings" + boshplat "github.com/cloudfoundry/bosh-agent/v2/platform" + boshsettings "github.com/cloudfoundry/bosh-agent/v2/settings" bosherr "github.com/cloudfoundry/bosh-utils/errors" boshlog "github.com/cloudfoundry/bosh-utils/logger" ) diff --git a/infrastructure/settings_source_factory_test.go b/infrastructure/settings_source_factory_test.go index 681d35c35..2306dc21a 100644 --- a/infrastructure/settings_source_factory_test.go +++ b/infrastructure/settings_source_factory_test.go @@ -6,8 +6,8 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/cloudfoundry/bosh-agent/infrastructure" - "github.com/cloudfoundry/bosh-agent/platform/platformfakes" + . "github.com/cloudfoundry/bosh-agent/v2/infrastructure" + "github.com/cloudfoundry/bosh-agent/v2/platform/platformfakes" boshlog "github.com/cloudfoundry/bosh-utils/logger" ) diff --git a/integration/apply_test.go b/integration/apply_test.go index bfebdfb13..103be7906 100644 --- a/integration/apply_test.go +++ b/integration/apply_test.go @@ -7,8 +7,8 @@ import ( "path/filepath" "time" - "github.com/cloudfoundry/bosh-agent/agentclient/applyspec" - "github.com/cloudfoundry/bosh-agent/settings" + "github.com/cloudfoundry/bosh-agent/v2/agentclient/applyspec" + "github.com/cloudfoundry/bosh-agent/v2/settings" ) var _ = Describe("apply", func() { diff --git a/integration/bundle_logs_test.go b/integration/bundle_logs_test.go index 76390c3e5..e9ed44890 100644 --- a/integration/bundle_logs_test.go +++ b/integration/bundle_logs_test.go @@ -6,8 +6,8 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/cloudfoundry/bosh-agent/agent/action" - "github.com/cloudfoundry/bosh-agent/settings" + "github.com/cloudfoundry/bosh-agent/v2/agent/action" + "github.com/cloudfoundry/bosh-agent/v2/settings" ) var _ = Describe("bundle_logs", func() { diff --git a/integration/compile_package_test.go b/integration/compile_package_test.go index 745bd4edb..c1a360dc9 100644 --- a/integration/compile_package_test.go +++ b/integration/compile_package_test.go @@ -9,10 +9,10 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/cloudfoundry/bosh-agent/agent/action" - boshcomp "github.com/cloudfoundry/bosh-agent/agent/compiler" - "github.com/cloudfoundry/bosh-agent/agentclient" - "github.com/cloudfoundry/bosh-agent/settings" + "github.com/cloudfoundry/bosh-agent/v2/agent/action" + boshcomp "github.com/cloudfoundry/bosh-agent/v2/agent/compiler" + "github.com/cloudfoundry/bosh-agent/v2/agentclient" + "github.com/cloudfoundry/bosh-agent/v2/settings" boshcrypto "github.com/cloudfoundry/bosh-utils/crypto" ) diff --git a/integration/delete_arp_entries_test.go b/integration/delete_arp_entries_test.go index 0b976828e..269414a14 100644 --- a/integration/delete_arp_entries_test.go +++ b/integration/delete_arp_entries_test.go @@ -3,7 +3,7 @@ package integration_test import ( "regexp" - "github.com/cloudfoundry/bosh-agent/settings" + "github.com/cloudfoundry/bosh-agent/v2/settings" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/integration/ephemeral_disk_test.go b/integration/ephemeral_disk_test.go index 340b37c74..b7d4a51f3 100644 --- a/integration/ephemeral_disk_test.go +++ b/integration/ephemeral_disk_test.go @@ -7,7 +7,7 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/cloudfoundry/bosh-agent/settings" + "github.com/cloudfoundry/bosh-agent/v2/settings" ) var _ = Describe("EphemeralDisk", func() { diff --git a/integration/fetch_logs_test.go b/integration/fetch_logs_test.go index b3af6c192..aa0b81a7f 100644 --- a/integration/fetch_logs_test.go +++ b/integration/fetch_logs_test.go @@ -6,7 +6,7 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/cloudfoundry/bosh-agent/settings" + "github.com/cloudfoundry/bosh-agent/v2/settings" ) var _ = Describe("fetch_logs", func() { diff --git a/integration/fetch_logs_with_signed_url_test.go b/integration/fetch_logs_with_signed_url_test.go index d3f2ae1bd..4a59474ef 100644 --- a/integration/fetch_logs_with_signed_url_test.go +++ b/integration/fetch_logs_with_signed_url_test.go @@ -7,7 +7,7 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/cloudfoundry/bosh-agent/settings" + "github.com/cloudfoundry/bosh-agent/v2/settings" ) var _ = Describe("fetch_logs_with_signed_url", func() { diff --git a/integration/file_settings_test.go b/integration/file_settings_test.go index 5703dfbd1..4cf7d4c98 100644 --- a/integration/file_settings_test.go +++ b/integration/file_settings_test.go @@ -4,7 +4,7 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/cloudfoundry/bosh-agent/settings" + "github.com/cloudfoundry/bosh-agent/v2/settings" ) var _ = Describe("FileSettings", func() { diff --git a/integration/instance_info_test.go b/integration/instance_info_test.go index f43d4aefc..48f8c0066 100644 --- a/integration/instance_info_test.go +++ b/integration/instance_info_test.go @@ -1,10 +1,10 @@ package integration_test import ( - "github.com/cloudfoundry/bosh-agent/settings" + "github.com/cloudfoundry/bosh-agent/v2/settings" - "github.com/cloudfoundry/bosh-agent/agentclient/applyspec" - "github.com/cloudfoundry/bosh-agent/integration" + "github.com/cloudfoundry/bosh-agent/v2/agentclient/applyspec" + "github.com/cloudfoundry/bosh-agent/v2/integration" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/integration/integration_suite_test.go b/integration/integration_suite_test.go index 39c8d3d45..aefb13fa5 100644 --- a/integration/integration_suite_test.go +++ b/integration/integration_suite_test.go @@ -6,7 +6,7 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/cloudfoundry/bosh-agent/integration" + "github.com/cloudfoundry/bosh-agent/v2/integration" boshlog "github.com/cloudfoundry/bosh-utils/logger" boshsys "github.com/cloudfoundry/bosh-utils/system" ) diff --git a/integration/integrationagentclient/agent_client.go b/integration/integrationagentclient/agent_client.go index d524a3410..f0f86f6e7 100644 --- a/integration/integrationagentclient/agent_client.go +++ b/integration/integrationagentclient/agent_client.go @@ -4,10 +4,10 @@ import ( "encoding/json" "time" - "github.com/cloudfoundry/bosh-agent/agent/action" - "github.com/cloudfoundry/bosh-agent/agent/applier/applyspec" - "github.com/cloudfoundry/bosh-agent/agentclient/http" - "github.com/cloudfoundry/bosh-agent/settings" + "github.com/cloudfoundry/bosh-agent/v2/agent/action" + "github.com/cloudfoundry/bosh-agent/v2/agent/applier/applyspec" + "github.com/cloudfoundry/bosh-agent/v2/agentclient/http" + "github.com/cloudfoundry/bosh-agent/v2/settings" boshcrypto "github.com/cloudfoundry/bosh-utils/crypto" bosherr "github.com/cloudfoundry/bosh-utils/errors" "github.com/cloudfoundry/bosh-utils/httpclient" diff --git a/integration/integrationagentclient/agent_client_test.go b/integration/integrationagentclient/agent_client_test.go index 23f4453ae..8e1ba6a5f 100644 --- a/integration/integrationagentclient/agent_client_test.go +++ b/integration/integrationagentclient/agent_client_test.go @@ -9,9 +9,9 @@ import ( . "github.com/onsi/gomega" "github.com/onsi/gomega/ghttp" - "github.com/cloudfoundry/bosh-agent/agent/action" - agentclienthttp "github.com/cloudfoundry/bosh-agent/agentclient/http" - "github.com/cloudfoundry/bosh-agent/integration/integrationagentclient" + "github.com/cloudfoundry/bosh-agent/v2/agent/action" + agentclienthttp "github.com/cloudfoundry/bosh-agent/v2/agentclient/http" + "github.com/cloudfoundry/bosh-agent/v2/integration/integrationagentclient" "github.com/cloudfoundry/bosh-utils/httpclient" boshlog "github.com/cloudfoundry/bosh-utils/logger" ) diff --git a/integration/nats_firewall_test.go b/integration/nats_firewall_test.go index 8f6b329fe..ae4d6d8ba 100644 --- a/integration/nats_firewall_test.go +++ b/integration/nats_firewall_test.go @@ -4,7 +4,7 @@ import ( "fmt" "os" - "github.com/cloudfoundry/bosh-agent/settings" + "github.com/cloudfoundry/bosh-agent/v2/settings" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/onsi/gomega/format" @@ -14,14 +14,14 @@ var _ = Describe("nats firewall", func() { Context("ipv4", func() { BeforeEach(func() { - //restore original settings of bosh from initial deploy of this VM. + // restore original settings of bosh from initial deploy of this VM. _, err := testEnvironment.RunCommand("sudo cp /settings-backup/*.json /var/vcap/bosh/") Expect(err).ToNot(HaveOccurred()) }) It("sets up the outgoing nats firewall", func() { format.MaxLength = 0 - //Wait a maximum of 300 seconds + // Wait a maximum of 300 seconds Eventually(func() string { logs, _ := testEnvironment.RunCommand("sudo cat /var/vcap/bosh/log/current") return logs @@ -29,13 +29,13 @@ var _ = Describe("nats firewall", func() { output, err := testEnvironment.RunCommand("sudo iptables -t mangle -L") Expect(err).To(BeNil()) - //Check iptables for inclusion of the nats_cgroup_id + // Check iptables for inclusion of the nats_cgroup_id Expect(output).To(MatchRegexp("ACCEPT *tcp -- anywhere.*tcp dpt:4222 cgroup 2958295042")) Expect(output).To(MatchRegexp("DROP *tcp -- anywhere.*tcp dpt:4222")) boshEnv := os.Getenv("BOSH_ENVIRONMENT") - //check that we cannot access the director nats, -w2 == timeout 2 seconds + // check that we cannot access the director nats, -w2 == timeout 2 seconds out, err := testEnvironment.RunCommand(fmt.Sprintf("nc %v 4222 -w2 -v", boshEnv)) Expect(err).NotTo(BeNil()) Expect(out).To(ContainSubstring("port 4222 (tcp) timed out")) @@ -76,7 +76,7 @@ var _ = Describe("nats firewall", func() { It("sets up the outgoing nats for firewall ipv6 ", func() { format.MaxLength = 0 - //Wait a maximum of 300 seconds + // Wait a maximum of 300 seconds Eventually(func() string { logs, _ := testEnvironment.RunCommand("sudo cat /var/vcap/bosh/log/current") return logs @@ -85,7 +85,7 @@ var _ = Describe("nats firewall", func() { output, err := testEnvironment.RunCommand("sudo ip6tables -t mangle -L") Expect(err).To(BeNil()) - //Check iptables for inclusion of the nats_cgroup_id + // Check iptables for inclusion of the nats_cgroup_id Expect(output).To(MatchRegexp("ACCEPT *tcp *anywhere *2001:db8::1 *tcp dpt:http-alt cgroup 2958295042")) Expect(output).To(MatchRegexp("DROP *tcp *anywhere *2001:db8::1 *tcp dpt:http-alt")) diff --git a/integration/prepare_test.go b/integration/prepare_test.go index 6e7244e8b..22f04683c 100644 --- a/integration/prepare_test.go +++ b/integration/prepare_test.go @@ -6,8 +6,8 @@ import ( "path/filepath" - "github.com/cloudfoundry/bosh-agent/agent/applier/applyspec" - "github.com/cloudfoundry/bosh-agent/settings" + "github.com/cloudfoundry/bosh-agent/v2/agent/applier/applyspec" + "github.com/cloudfoundry/bosh-agent/v2/settings" boshcrypto "github.com/cloudfoundry/bosh-utils/crypto" ) diff --git a/integration/raw_ephemeral_disk_test.go b/integration/raw_ephemeral_disk_test.go index bac983ce4..a0c6ee7c9 100644 --- a/integration/raw_ephemeral_disk_test.go +++ b/integration/raw_ephemeral_disk_test.go @@ -6,7 +6,7 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - boshsettings "github.com/cloudfoundry/bosh-agent/settings" + boshsettings "github.com/cloudfoundry/bosh-agent/v2/settings" ) var _ = Describe("RawEphemeralDisk", func() { diff --git a/integration/remove_file_test.go b/integration/remove_file_test.go index 6ac329aa4..4def5ca06 100644 --- a/integration/remove_file_test.go +++ b/integration/remove_file_test.go @@ -6,7 +6,7 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/cloudfoundry/bosh-agent/settings" + "github.com/cloudfoundry/bosh-agent/v2/settings" ) var _ = Describe("remove_file", func() { diff --git a/integration/run_script_test.go b/integration/run_script_test.go index aaeabf314..899f4e3dd 100644 --- a/integration/run_script_test.go +++ b/integration/run_script_test.go @@ -6,8 +6,8 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/cloudfoundry/bosh-agent/agentclient/applyspec" - "github.com/cloudfoundry/bosh-agent/settings" + "github.com/cloudfoundry/bosh-agent/v2/agentclient/applyspec" + "github.com/cloudfoundry/bosh-agent/v2/settings" ) func setupDummyJob() { diff --git a/integration/sync_dns_test.go b/integration/sync_dns_test.go index 75dc7df67..34909e165 100644 --- a/integration/sync_dns_test.go +++ b/integration/sync_dns_test.go @@ -10,7 +10,7 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/cloudfoundry/bosh-agent/settings" + "github.com/cloudfoundry/bosh-agent/v2/settings" boshcrypto "github.com/cloudfoundry/bosh-utils/crypto" ) diff --git a/integration/system_mounts_test.go b/integration/system_mounts_test.go index 39559c4d6..de171ddfb 100644 --- a/integration/system_mounts_test.go +++ b/integration/system_mounts_test.go @@ -7,7 +7,7 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - boshsettings "github.com/cloudfoundry/bosh-agent/settings" + boshsettings "github.com/cloudfoundry/bosh-agent/v2/settings" ) var _ = Describe("SystemMounts", func() { diff --git a/integration/test_environment.go b/integration/test_environment.go index f393bdcc0..2a5a28b53 100644 --- a/integration/test_environment.go +++ b/integration/test_environment.go @@ -18,9 +18,9 @@ import ( "github.com/kevinburke/ssh_config" "golang.org/x/crypto/ssh" - "github.com/cloudfoundry/bosh-agent/integration/integrationagentclient" - "github.com/cloudfoundry/bosh-agent/settings" - boshsettings "github.com/cloudfoundry/bosh-agent/settings" + "github.com/cloudfoundry/bosh-agent/v2/integration/integrationagentclient" + "github.com/cloudfoundry/bosh-agent/v2/settings" + boshsettings "github.com/cloudfoundry/bosh-agent/v2/settings" ) const agentCert = `-----BEGIN CERTIFICATE----- @@ -136,7 +136,7 @@ func (t *TestEnvironment) DetachDevice(dir string) error { // Lazily unmount /var/log to prevent intermittent test failures. As of 2024-06-24, this mount point // is a bind mount of /var/vcap/data/root_log. For reasons we don't currently understand the - //'fuser -k' doesn't seem to consistently terminate processes in time to do the umount, but this is + // 'fuser -k' doesn't seem to consistently terminate processes in time to do the umount, but this is // the only mount that has this problem. // // Because we later unmount /var/vcap/data, lazily unmounting /var/log will eventually alert us if diff --git a/integration/update_settings_test.go b/integration/update_settings_test.go index a508e65aa..bfdbfbfed 100644 --- a/integration/update_settings_test.go +++ b/integration/update_settings_test.go @@ -1,7 +1,7 @@ package integration_test import ( - "github.com/cloudfoundry/bosh-agent/settings" + "github.com/cloudfoundry/bosh-agent/v2/settings" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/integration/user_permissions_test.go b/integration/user_permissions_test.go index 6edd760f7..b3dcce534 100644 --- a/integration/user_permissions_test.go +++ b/integration/user_permissions_test.go @@ -1,12 +1,12 @@ package integration_test import ( - "github.com/cloudfoundry/bosh-agent/agent/action" - "github.com/cloudfoundry/bosh-agent/settings" + "github.com/cloudfoundry/bosh-agent/v2/agent/action" + "github.com/cloudfoundry/bosh-agent/v2/settings" "strings" - "github.com/cloudfoundry/bosh-agent/integration" + "github.com/cloudfoundry/bosh-agent/v2/integration" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/integration/utils/blobstore.go b/integration/utils/blobstore.go index 92907add5..08931201b 100644 --- a/integration/utils/blobstore.go +++ b/integration/utils/blobstore.go @@ -6,7 +6,7 @@ import ( "os" "time" - "github.com/cloudfoundry/bosh-agent/integration/windows/utils" + "github.com/cloudfoundry/bosh-agent/v2/integration/windows/utils" davclient "github.com/cloudfoundry/bosh-davcli/client" davconfig "github.com/cloudfoundry/bosh-davcli/config" diff --git a/integration/utils/nats_client.go b/integration/utils/nats_client.go index 6b7df79cd..4b219d3ca 100644 --- a/integration/utils/nats_client.go +++ b/integration/utils/nats_client.go @@ -15,13 +15,13 @@ import ( "text/template" "time" - "github.com/cloudfoundry/bosh-agent/integration/windows/utils" + "github.com/cloudfoundry/bosh-agent/v2/integration/windows/utils" "golang.org/x/crypto/ssh" - "github.com/cloudfoundry/bosh-agent/agent/action" - boshalert "github.com/cloudfoundry/bosh-agent/agent/alert" - "github.com/cloudfoundry/bosh-agent/agentclient/http" + "github.com/cloudfoundry/bosh-agent/v2/agent/action" + boshalert "github.com/cloudfoundry/bosh-agent/v2/agent/alert" + "github.com/cloudfoundry/bosh-agent/v2/agentclient/http" boshfileutil "github.com/cloudfoundry/bosh-utils/fileutil" "github.com/nats-io/nats.go" diff --git a/integration/v1_apply_test.go b/integration/v1_apply_test.go index 377397531..95742148b 100644 --- a/integration/v1_apply_test.go +++ b/integration/v1_apply_test.go @@ -7,8 +7,8 @@ import ( "path/filepath" "time" - "github.com/cloudfoundry/bosh-agent/agent/applier/applyspec" - "github.com/cloudfoundry/bosh-agent/settings" + "github.com/cloudfoundry/bosh-agent/v2/agent/applier/applyspec" + "github.com/cloudfoundry/bosh-agent/v2/settings" boshcrypto "github.com/cloudfoundry/bosh-utils/crypto" ) diff --git a/integration/windows/environment_test.go b/integration/windows/environment_test.go index 1fa0d587e..54c595bfc 100644 --- a/integration/windows/environment_test.go +++ b/integration/windows/environment_test.go @@ -13,7 +13,7 @@ import ( "github.com/masterzen/winrm" . "github.com/onsi/gomega" - "github.com/cloudfoundry/bosh-agent/platform/windows/disk" + "github.com/cloudfoundry/bosh-agent/v2/platform/windows/disk" ) const dataDir = `C:\var\vcap\data\` diff --git a/integration/windows/windows_suite_test.go b/integration/windows/windows_suite_test.go index c7492f120..0022e3c36 100644 --- a/integration/windows/windows_suite_test.go +++ b/integration/windows/windows_suite_test.go @@ -17,8 +17,8 @@ import ( . "github.com/onsi/gomega" "github.com/onsi/gomega/gexec" - "github.com/cloudfoundry/bosh-agent/integration/windows/utils" - "github.com/cloudfoundry/bosh-agent/platform/windows/disk" + "github.com/cloudfoundry/bosh-agent/v2/integration/windows/utils" + "github.com/cloudfoundry/bosh-agent/v2/platform/windows/disk" ) var ( diff --git a/integration/windows/windows_test.go b/integration/windows/windows_test.go index 78c27e50c..5df69059f 100644 --- a/integration/windows/windows_test.go +++ b/integration/windows/windows_test.go @@ -16,9 +16,9 @@ import ( . "github.com/onsi/gomega" "golang.org/x/crypto/ssh" - "github.com/cloudfoundry/bosh-agent/agent/action" - "github.com/cloudfoundry/bosh-agent/integration/utils" - windowsutils "github.com/cloudfoundry/bosh-agent/integration/windows/utils" + "github.com/cloudfoundry/bosh-agent/v2/agent/action" + "github.com/cloudfoundry/bosh-agent/v2/integration/utils" + windowsutils "github.com/cloudfoundry/bosh-agent/v2/integration/windows/utils" ) const ( @@ -87,7 +87,7 @@ var _ = Describe("An Agent running on Windows", func() { agent.EnsureAgentServiceStopped() }) It("blocks outgoing nats access for all other binaries once started", func() { - //The FW Rule works on basis of a binary (winAppId). Thus even shelling out from the Agent will not be allowed. + // The FW Rule works on basis of a binary (winAppId). Thus even shelling out from the Agent will not be allowed. output := agent.RunPowershellCommand(fmt.Sprintf("Test-NetConnection -ComputerName %v -Port %v", windowsutils.FakeDirectorIP(), 4222)) Expect(output).To(ContainSubstring("TcpTestSucceeded : False")) }) diff --git a/jobsupervisor/alert_envelope.go b/jobsupervisor/alert_envelope.go index 37146d588..cb706ace5 100644 --- a/jobsupervisor/alert_envelope.go +++ b/jobsupervisor/alert_envelope.go @@ -6,7 +6,7 @@ import ( "github.com/pivotal/go-smtpd/smtpd" - boshalert "github.com/cloudfoundry/bosh-agent/agent/alert" + boshalert "github.com/cloudfoundry/bosh-agent/v2/agent/alert" ) type alertEnvelope struct { diff --git a/jobsupervisor/dummy_nats_job_supervisor.go b/jobsupervisor/dummy_nats_job_supervisor.go index bc53a99ec..44bd949ef 100644 --- a/jobsupervisor/dummy_nats_job_supervisor.go +++ b/jobsupervisor/dummy_nats_job_supervisor.go @@ -3,8 +3,8 @@ package jobsupervisor import ( "encoding/json" - boshalert "github.com/cloudfoundry/bosh-agent/agent/alert" - boshhandler "github.com/cloudfoundry/bosh-agent/handler" + boshalert "github.com/cloudfoundry/bosh-agent/v2/agent/alert" + boshhandler "github.com/cloudfoundry/bosh-agent/v2/handler" bosherror "github.com/cloudfoundry/bosh-utils/errors" ) diff --git a/jobsupervisor/dummy_nats_job_supervisor_test.go b/jobsupervisor/dummy_nats_job_supervisor_test.go index 3f22b1918..cc73db96d 100644 --- a/jobsupervisor/dummy_nats_job_supervisor_test.go +++ b/jobsupervisor/dummy_nats_job_supervisor_test.go @@ -4,10 +4,10 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - boshalert "github.com/cloudfoundry/bosh-agent/agent/alert" - boshhandler "github.com/cloudfoundry/bosh-agent/handler" - . "github.com/cloudfoundry/bosh-agent/jobsupervisor" - fakembus "github.com/cloudfoundry/bosh-agent/mbus/fakes" + boshalert "github.com/cloudfoundry/bosh-agent/v2/agent/alert" + boshhandler "github.com/cloudfoundry/bosh-agent/v2/handler" + . "github.com/cloudfoundry/bosh-agent/v2/jobsupervisor" + fakembus "github.com/cloudfoundry/bosh-agent/v2/mbus/fakes" ) var _ = Describe("dummyNatsJobSupervisor", func() { diff --git a/jobsupervisor/fakes/fake_job_supervisor.go b/jobsupervisor/fakes/fake_job_supervisor.go index bb80880cc..00f55b891 100644 --- a/jobsupervisor/fakes/fake_job_supervisor.go +++ b/jobsupervisor/fakes/fake_job_supervisor.go @@ -3,8 +3,8 @@ package fakes import ( "sync" - boshalert "github.com/cloudfoundry/bosh-agent/agent/alert" - boshjobsuper "github.com/cloudfoundry/bosh-agent/jobsupervisor" + boshalert "github.com/cloudfoundry/bosh-agent/v2/agent/alert" + boshjobsuper "github.com/cloudfoundry/bosh-agent/v2/jobsupervisor" ) type FakeJobSupervisor struct { diff --git a/jobsupervisor/job_supervisor_interface.go b/jobsupervisor/job_supervisor_interface.go index 21f91ec7e..47f45ad4c 100644 --- a/jobsupervisor/job_supervisor_interface.go +++ b/jobsupervisor/job_supervisor_interface.go @@ -1,7 +1,7 @@ package jobsupervisor import ( - boshalert "github.com/cloudfoundry/bosh-agent/agent/alert" + boshalert "github.com/cloudfoundry/bosh-agent/v2/agent/alert" ) type Process struct { diff --git a/jobsupervisor/monit/fakes/fake_monit_client.go b/jobsupervisor/monit/fakes/fake_monit_client.go index fece81e2b..f50154810 100644 --- a/jobsupervisor/monit/fakes/fake_monit_client.go +++ b/jobsupervisor/monit/fakes/fake_monit_client.go @@ -1,7 +1,7 @@ package fakes import ( - boshmonit "github.com/cloudfoundry/bosh-agent/jobsupervisor/monit" + boshmonit "github.com/cloudfoundry/bosh-agent/v2/jobsupervisor/monit" ) type FakeMonitClient struct { diff --git a/jobsupervisor/monit/fakes/fake_monit_status.go b/jobsupervisor/monit/fakes/fake_monit_status.go index 78d9cd320..2fee7b926 100644 --- a/jobsupervisor/monit/fakes/fake_monit_status.go +++ b/jobsupervisor/monit/fakes/fake_monit_status.go @@ -1,7 +1,7 @@ package fakes import ( - boshmonit "github.com/cloudfoundry/bosh-agent/jobsupervisor/monit" + boshmonit "github.com/cloudfoundry/bosh-agent/v2/jobsupervisor/monit" ) type FakeMonitStatus struct { diff --git a/jobsupervisor/monit/http_client_test.go b/jobsupervisor/monit/http_client_test.go index d3008f5c1..d98efa911 100644 --- a/jobsupervisor/monit/http_client_test.go +++ b/jobsupervisor/monit/http_client_test.go @@ -11,8 +11,8 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/cloudfoundry/bosh-agent/jobsupervisor/monit" - "github.com/cloudfoundry/bosh-agent/jobsupervisor/monit/monitfakes" + . "github.com/cloudfoundry/bosh-agent/v2/jobsupervisor/monit" + "github.com/cloudfoundry/bosh-agent/v2/jobsupervisor/monit/monitfakes" boshlog "github.com/cloudfoundry/bosh-utils/logger" ) diff --git a/jobsupervisor/monit/monit_retry_strategy_test.go b/jobsupervisor/monit/monit_retry_strategy_test.go index 899db8753..2e0ed36f4 100644 --- a/jobsupervisor/monit/monit_retry_strategy_test.go +++ b/jobsupervisor/monit/monit_retry_strategy_test.go @@ -9,13 +9,13 @@ import ( boshretry "github.com/cloudfoundry/bosh-utils/retrystrategy" - fakeboshaction "github.com/cloudfoundry/bosh-agent/agent/action/fakes" + fakeboshaction "github.com/cloudfoundry/bosh-agent/v2/agent/action/fakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/cloudfoundry/bosh-agent/jobsupervisor/monit" - "github.com/cloudfoundry/bosh-agent/jobsupervisor/monit/monitfakes" + . "github.com/cloudfoundry/bosh-agent/v2/jobsupervisor/monit" + "github.com/cloudfoundry/bosh-agent/v2/jobsupervisor/monit/monitfakes" ) var _ = Describe("MonitRetryStrategy", func() { diff --git a/jobsupervisor/monit/monitfakes/fake_httpclient.go b/jobsupervisor/monit/monitfakes/fake_httpclient.go index 69d0a9de7..4f5a9f2b3 100644 --- a/jobsupervisor/monit/monitfakes/fake_httpclient.go +++ b/jobsupervisor/monit/monitfakes/fake_httpclient.go @@ -5,7 +5,7 @@ import ( "net/http" "sync" - "github.com/cloudfoundry/bosh-agent/jobsupervisor/monit" + "github.com/cloudfoundry/bosh-agent/v2/jobsupervisor/monit" ) type FakeHTTPClient struct { diff --git a/jobsupervisor/monit/monitfakes/fake_request_retryable.go b/jobsupervisor/monit/monitfakes/fake_request_retryable.go index 12f4d2693..ecde50db3 100644 --- a/jobsupervisor/monit/monitfakes/fake_request_retryable.go +++ b/jobsupervisor/monit/monitfakes/fake_request_retryable.go @@ -5,7 +5,7 @@ import ( "net/http" "sync" - "github.com/cloudfoundry/bosh-agent/jobsupervisor/monit" + "github.com/cloudfoundry/bosh-agent/v2/jobsupervisor/monit" ) type FakeRequestRetryable struct { diff --git a/jobsupervisor/monit/provider.go b/jobsupervisor/monit/provider.go index bd31ffb84..ca0eedfb6 100644 --- a/jobsupervisor/monit/provider.go +++ b/jobsupervisor/monit/provider.go @@ -4,7 +4,7 @@ import ( "net/http" "time" - boshplatform "github.com/cloudfoundry/bosh-agent/platform" + boshplatform "github.com/cloudfoundry/bosh-agent/v2/platform" bosherr "github.com/cloudfoundry/bosh-utils/errors" "github.com/cloudfoundry/bosh-utils/httpclient" boshlog "github.com/cloudfoundry/bosh-utils/logger" diff --git a/jobsupervisor/monit/provider_test.go b/jobsupervisor/monit/provider_test.go index 5abd15e51..e795045ec 100644 --- a/jobsupervisor/monit/provider_test.go +++ b/jobsupervisor/monit/provider_test.go @@ -4,11 +4,11 @@ import ( "net/http" "time" - . "github.com/cloudfoundry/bosh-agent/jobsupervisor/monit" + . "github.com/cloudfoundry/bosh-agent/v2/jobsupervisor/monit" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/cloudfoundry/bosh-agent/platform/platformfakes" + "github.com/cloudfoundry/bosh-agent/v2/platform/platformfakes" "github.com/cloudfoundry/bosh-utils/httpclient" boshlog "github.com/cloudfoundry/bosh-utils/logger" diff --git a/jobsupervisor/monit/status_test.go b/jobsupervisor/monit/status_test.go index ed442951f..8abf9cca5 100644 --- a/jobsupervisor/monit/status_test.go +++ b/jobsupervisor/monit/status_test.go @@ -9,7 +9,7 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/cloudfoundry/bosh-agent/jobsupervisor/monit" + . "github.com/cloudfoundry/bosh-agent/v2/jobsupervisor/monit" boshlog "github.com/cloudfoundry/bosh-utils/logger" ) diff --git a/jobsupervisor/monit_job_supervisor.go b/jobsupervisor/monit_job_supervisor.go index 6230e2ded..c5a9e299c 100644 --- a/jobsupervisor/monit_job_supervisor.go +++ b/jobsupervisor/monit_job_supervisor.go @@ -7,12 +7,12 @@ import ( "time" "code.cloudfoundry.org/clock" - "github.com/cloudfoundry/bosh-agent/servicemanager" + "github.com/cloudfoundry/bosh-agent/v2/servicemanager" "github.com/pivotal/go-smtpd/smtpd" - boshalert "github.com/cloudfoundry/bosh-agent/agent/alert" - boshmonit "github.com/cloudfoundry/bosh-agent/jobsupervisor/monit" - boshdir "github.com/cloudfoundry/bosh-agent/settings/directories" + boshalert "github.com/cloudfoundry/bosh-agent/v2/agent/alert" + boshmonit "github.com/cloudfoundry/bosh-agent/v2/jobsupervisor/monit" + boshdir "github.com/cloudfoundry/bosh-agent/v2/settings/directories" bosherr "github.com/cloudfoundry/bosh-utils/errors" boshlog "github.com/cloudfoundry/bosh-utils/logger" boshsys "github.com/cloudfoundry/bosh-utils/system" diff --git a/jobsupervisor/monit_job_supervisor_test.go b/jobsupervisor/monit_job_supervisor_test.go index 6d6a16719..cb77574e1 100644 --- a/jobsupervisor/monit_job_supervisor_test.go +++ b/jobsupervisor/monit_job_supervisor_test.go @@ -16,12 +16,12 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - boshalert "github.com/cloudfoundry/bosh-agent/agent/alert" - . "github.com/cloudfoundry/bosh-agent/jobsupervisor" - boshmonit "github.com/cloudfoundry/bosh-agent/jobsupervisor/monit" - fakemonit "github.com/cloudfoundry/bosh-agent/jobsupervisor/monit/fakes" - "github.com/cloudfoundry/bosh-agent/servicemanager/servicemanagerfakes" - boshdir "github.com/cloudfoundry/bosh-agent/settings/directories" + boshalert "github.com/cloudfoundry/bosh-agent/v2/agent/alert" + . "github.com/cloudfoundry/bosh-agent/v2/jobsupervisor" + boshmonit "github.com/cloudfoundry/bosh-agent/v2/jobsupervisor/monit" + fakemonit "github.com/cloudfoundry/bosh-agent/v2/jobsupervisor/monit/fakes" + "github.com/cloudfoundry/bosh-agent/v2/servicemanager/servicemanagerfakes" + boshdir "github.com/cloudfoundry/bosh-agent/v2/settings/directories" boshlog "github.com/cloudfoundry/bosh-utils/logger" fakesys "github.com/cloudfoundry/bosh-utils/system/fakes" ) diff --git a/jobsupervisor/pipe/main.go b/jobsupervisor/pipe/main.go index c77a9421d..ccd740bd1 100644 --- a/jobsupervisor/pipe/main.go +++ b/jobsupervisor/pipe/main.go @@ -17,7 +17,7 @@ import ( "syscall" "time" - "github.com/cloudfoundry/bosh-agent/jobsupervisor/pipe/syslog" + "github.com/cloudfoundry/bosh-agent/v2/jobsupervisor/pipe/syslog" ) type noopWriter struct{} diff --git a/jobsupervisor/pipe/main_test.go b/jobsupervisor/pipe/main_test.go index 3514d34ea..f91c690a0 100644 --- a/jobsupervisor/pipe/main_test.go +++ b/jobsupervisor/pipe/main_test.go @@ -24,7 +24,7 @@ import ( "github.com/onsi/gomega/ghttp" - "github.com/cloudfoundry/bosh-agent/jobsupervisor/pipe/syslog" + "github.com/cloudfoundry/bosh-agent/v2/jobsupervisor/pipe/syslog" ) const ServiceName = "jim-bob" diff --git a/jobsupervisor/pipe/winsw_pipe_suite_test.go b/jobsupervisor/pipe/winsw_pipe_suite_test.go index 4616d2973..893c55e13 100644 --- a/jobsupervisor/pipe/winsw_pipe_suite_test.go +++ b/jobsupervisor/pipe/winsw_pipe_suite_test.go @@ -23,7 +23,7 @@ const echoOutput = "hello" func TestWinswPipe(t *testing.T) { BeforeSuite(func() { var err error - pathToPipeCLI, err = gexec.Build("github.com/cloudfoundry/bosh-agent/jobsupervisor/pipe") + pathToPipeCLI, err = gexec.Build("github.com/cloudfoundry/bosh-agent/v2/jobsupervisor/pipe") Expect(err).To(Succeed()) GoSequencePath, err = gexec.Build("./testdata/gosequence/gosequence.go") diff --git a/jobsupervisor/provider.go b/jobsupervisor/provider.go index 543366a80..ed33dd275 100644 --- a/jobsupervisor/provider.go +++ b/jobsupervisor/provider.go @@ -8,10 +8,10 @@ import ( "code.cloudfoundry.org/clock" - boshhandler "github.com/cloudfoundry/bosh-agent/handler" - boshmonit "github.com/cloudfoundry/bosh-agent/jobsupervisor/monit" - boshplatform "github.com/cloudfoundry/bosh-agent/platform" - boshdir "github.com/cloudfoundry/bosh-agent/settings/directories" + boshhandler "github.com/cloudfoundry/bosh-agent/v2/handler" + boshmonit "github.com/cloudfoundry/bosh-agent/v2/jobsupervisor/monit" + boshplatform "github.com/cloudfoundry/bosh-agent/v2/platform" + boshdir "github.com/cloudfoundry/bosh-agent/v2/settings/directories" bosherr "github.com/cloudfoundry/bosh-utils/errors" boshlog "github.com/cloudfoundry/bosh-utils/logger" ) diff --git a/jobsupervisor/provider_test.go b/jobsupervisor/provider_test.go index 2c2c8cb4c..8d065f2c2 100644 --- a/jobsupervisor/provider_test.go +++ b/jobsupervisor/provider_test.go @@ -4,19 +4,19 @@ import ( "runtime" "time" - . "github.com/cloudfoundry/bosh-agent/jobsupervisor" + . "github.com/cloudfoundry/bosh-agent/v2/jobsupervisor" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "code.cloudfoundry.org/clock" - "github.com/cloudfoundry/bosh-agent/platform/platformfakes" - "github.com/cloudfoundry/bosh-agent/servicemanager/servicemanagerfakes" + "github.com/cloudfoundry/bosh-agent/v2/platform/platformfakes" + "github.com/cloudfoundry/bosh-agent/v2/servicemanager/servicemanagerfakes" - fakemonit "github.com/cloudfoundry/bosh-agent/jobsupervisor/monit/fakes" - fakembus "github.com/cloudfoundry/bosh-agent/mbus/fakes" + fakemonit "github.com/cloudfoundry/bosh-agent/v2/jobsupervisor/monit/fakes" + fakembus "github.com/cloudfoundry/bosh-agent/v2/mbus/fakes" fakesys "github.com/cloudfoundry/bosh-utils/system/fakes" - boshdir "github.com/cloudfoundry/bosh-agent/settings/directories" + boshdir "github.com/cloudfoundry/bosh-agent/v2/settings/directories" boshlog "github.com/cloudfoundry/bosh-utils/logger" ) diff --git a/jobsupervisor/provider_windows.go b/jobsupervisor/provider_windows.go index a31660803..6ebec6455 100644 --- a/jobsupervisor/provider_windows.go +++ b/jobsupervisor/provider_windows.go @@ -6,10 +6,10 @@ package jobsupervisor import ( "os" - boshhandler "github.com/cloudfoundry/bosh-agent/handler" - boshmonit "github.com/cloudfoundry/bosh-agent/jobsupervisor/monit" - boshplatform "github.com/cloudfoundry/bosh-agent/platform" - boshdir "github.com/cloudfoundry/bosh-agent/settings/directories" + boshhandler "github.com/cloudfoundry/bosh-agent/v2/handler" + boshmonit "github.com/cloudfoundry/bosh-agent/v2/jobsupervisor/monit" + boshplatform "github.com/cloudfoundry/bosh-agent/v2/platform" + boshdir "github.com/cloudfoundry/bosh-agent/v2/settings/directories" bosherr "github.com/cloudfoundry/bosh-utils/errors" boshlog "github.com/cloudfoundry/bosh-utils/logger" ) diff --git a/jobsupervisor/windows_job_supervisor.go b/jobsupervisor/windows_job_supervisor.go index 21729c0de..2a4e80f9f 100644 --- a/jobsupervisor/windows_job_supervisor.go +++ b/jobsupervisor/windows_job_supervisor.go @@ -22,10 +22,10 @@ import ( "golang.org/x/sys/windows/svc" - "github.com/cloudfoundry/bosh-agent/jobsupervisor/winsvc" + "github.com/cloudfoundry/bosh-agent/v2/jobsupervisor/winsvc" - boshalert "github.com/cloudfoundry/bosh-agent/agent/alert" - boshdirs "github.com/cloudfoundry/bosh-agent/settings/directories" + boshalert "github.com/cloudfoundry/bosh-agent/v2/agent/alert" + boshdirs "github.com/cloudfoundry/bosh-agent/v2/settings/directories" bosherr "github.com/cloudfoundry/bosh-utils/errors" boshlog "github.com/cloudfoundry/bosh-utils/logger" boshsys "github.com/cloudfoundry/bosh-utils/system" diff --git a/jobsupervisor/windows_job_supervisor_test.go b/jobsupervisor/windows_job_supervisor_test.go index f82af6cce..026b73e69 100755 --- a/jobsupervisor/windows_job_supervisor_test.go +++ b/jobsupervisor/windows_job_supervisor_test.go @@ -23,13 +23,13 @@ import ( "golang.org/x/sys/windows/svc" "golang.org/x/sys/windows/svc/mgr" - boshalert "github.com/cloudfoundry/bosh-agent/agent/alert" - "github.com/cloudfoundry/bosh-agent/jobsupervisor/winsvc" - boshdirs "github.com/cloudfoundry/bosh-agent/settings/directories" + boshalert "github.com/cloudfoundry/bosh-agent/v2/agent/alert" + "github.com/cloudfoundry/bosh-agent/v2/jobsupervisor/winsvc" + boshdirs "github.com/cloudfoundry/bosh-agent/v2/settings/directories" boshlog "github.com/cloudfoundry/bosh-utils/logger" boshsys "github.com/cloudfoundry/bosh-utils/system" - . "github.com/cloudfoundry/bosh-agent/jobsupervisor" + . "github.com/cloudfoundry/bosh-agent/v2/jobsupervisor" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" @@ -83,16 +83,16 @@ var _ = BeforeSuite(func() { TempDir, err = os.MkdirTemp("", "bosh-") Expect(err).ToNot(HaveOccurred()) - StartStopExe, err = gexec.Build("github.com/cloudfoundry/bosh-agent/jobsupervisor/testdata/StartStop") + StartStopExe, err = gexec.Build("github.com/cloudfoundry/bosh-agent/v2/jobsupervisor/testdata/StartStop") Expect(err).ToNot(HaveOccurred()) - HelloExe, err = gexec.Build("github.com/cloudfoundry/bosh-agent/jobsupervisor/testdata/Hello") + HelloExe, err = gexec.Build("github.com/cloudfoundry/bosh-agent/v2/jobsupervisor/testdata/Hello") Expect(err).ToNot(HaveOccurred()) - FlapStartExe, err = gexec.Build("github.com/cloudfoundry/bosh-agent/jobsupervisor/testdata/FlapStart") + FlapStartExe, err = gexec.Build("github.com/cloudfoundry/bosh-agent/v2/jobsupervisor/testdata/FlapStart") Expect(err).ToNot(HaveOccurred()) - WaitSvcExe, err = gexec.Build("github.com/cloudfoundry/bosh-agent/jobsupervisor/testdata/WaitSvc") + WaitSvcExe, err = gexec.Build("github.com/cloudfoundry/bosh-agent/v2/jobsupervisor/testdata/WaitSvc") Expect(err).ToNot(HaveOccurred()) }) @@ -267,7 +267,7 @@ func flappingStartConfig(flapCount, jobCount int) (WindowsProcessConfig, error) } func buildPipeExe() error { - pathToPipeCLI, err := gexec.Build("github.com/cloudfoundry/bosh-agent/jobsupervisor/pipe") + pathToPipeCLI, err := gexec.Build("github.com/cloudfoundry/bosh-agent/v2/jobsupervisor/pipe") if err != nil { return err } diff --git a/jobsupervisor/wrapper_job_supervisor.go b/jobsupervisor/wrapper_job_supervisor.go index 592a89e98..eb5ab4036 100644 --- a/jobsupervisor/wrapper_job_supervisor.go +++ b/jobsupervisor/wrapper_job_supervisor.go @@ -4,7 +4,7 @@ import ( "encoding/json" "path/filepath" - "github.com/cloudfoundry/bosh-agent/settings/directories" + "github.com/cloudfoundry/bosh-agent/v2/settings/directories" boshlog "github.com/cloudfoundry/bosh-utils/logger" "github.com/cloudfoundry/bosh-utils/system" ) diff --git a/jobsupervisor/wrapper_job_supervisor_test.go b/jobsupervisor/wrapper_job_supervisor_test.go index 5334f96b4..33a0ecf21 100644 --- a/jobsupervisor/wrapper_job_supervisor_test.go +++ b/jobsupervisor/wrapper_job_supervisor_test.go @@ -1,15 +1,15 @@ package jobsupervisor_test import ( - . "github.com/cloudfoundry/bosh-agent/jobsupervisor" + . "github.com/cloudfoundry/bosh-agent/v2/jobsupervisor" "encoding/json" "errors" "path/filepath" - "github.com/cloudfoundry/bosh-agent/agent/alert" - "github.com/cloudfoundry/bosh-agent/jobsupervisor/fakes" - boshdir "github.com/cloudfoundry/bosh-agent/settings/directories" + "github.com/cloudfoundry/bosh-agent/v2/agent/alert" + "github.com/cloudfoundry/bosh-agent/v2/jobsupervisor/fakes" + boshdir "github.com/cloudfoundry/bosh-agent/v2/settings/directories" boshlog "github.com/cloudfoundry/bosh-utils/logger" fakesys "github.com/cloudfoundry/bosh-utils/system/fakes" . "github.com/onsi/ginkgo/v2" diff --git a/main/agent.go b/main/agent.go index e7a70f7fb..2416c0df3 100644 --- a/main/agent.go +++ b/main/agent.go @@ -7,9 +7,9 @@ import ( "syscall" "time" - boshapp "github.com/cloudfoundry/bosh-agent/app" - "github.com/cloudfoundry/bosh-agent/infrastructure/agentlogger" - "github.com/cloudfoundry/bosh-agent/platform" + boshapp "github.com/cloudfoundry/bosh-agent/v2/app" + "github.com/cloudfoundry/bosh-agent/v2/infrastructure/agentlogger" + "github.com/cloudfoundry/bosh-agent/v2/platform" "github.com/cloudfoundry/bosh-utils/logger" boshsys "github.com/cloudfoundry/bosh-utils/system" ) diff --git a/main/compile.go b/main/compile.go index 90390c4b0..25aae9555 100644 --- a/main/compile.go +++ b/main/compile.go @@ -6,10 +6,10 @@ import ( "log" "os" - "github.com/cloudfoundry/bosh-agent/app" - "github.com/cloudfoundry/bosh-agent/releasetarball" - "github.com/cloudfoundry/bosh-agent/settings/directories" - "github.com/cloudfoundry/bosh-agent/stemcellmetadata" + "github.com/cloudfoundry/bosh-agent/v2/app" + "github.com/cloudfoundry/bosh-agent/v2/releasetarball" + "github.com/cloudfoundry/bosh-agent/v2/settings/directories" + "github.com/cloudfoundry/bosh-agent/v2/stemcellmetadata" ) func compileTarball(command string, args []string) { diff --git a/matchers/matchers_test.go b/matchers/matchers_test.go index 5f795a60d..e145c485e 100644 --- a/matchers/matchers_test.go +++ b/matchers/matchers_test.go @@ -4,7 +4,7 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/cloudfoundry/bosh-agent/matchers" + . "github.com/cloudfoundry/bosh-agent/v2/matchers" ) var _ = Describe("MatchesOneOf", func() { diff --git a/matchers/one_of_matcher_test.go b/matchers/one_of_matcher_test.go index c55936dc9..a97cb8fae 100644 --- a/matchers/one_of_matcher_test.go +++ b/matchers/one_of_matcher_test.go @@ -4,7 +4,7 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/cloudfoundry/bosh-agent/matchers" + . "github.com/cloudfoundry/bosh-agent/v2/matchers" "fmt" ) diff --git a/mbus/fakes/fake_handler.go b/mbus/fakes/fake_handler.go index 1884bad30..4851cb016 100644 --- a/mbus/fakes/fake_handler.go +++ b/mbus/fakes/fake_handler.go @@ -3,7 +3,7 @@ package fakes import ( "sync" - boshhandler "github.com/cloudfoundry/bosh-agent/handler" + boshhandler "github.com/cloudfoundry/bosh-agent/v2/handler" ) type FakeHandler struct { diff --git a/mbus/handler_provider.go b/mbus/handler_provider.go index 2a7fc1375..590329769 100644 --- a/mbus/handler_provider.go +++ b/mbus/handler_provider.go @@ -5,10 +5,10 @@ import ( "github.com/nats-io/nats.go" - boshagentblobstore "github.com/cloudfoundry/bosh-agent/agent/blobstore" - boshhandler "github.com/cloudfoundry/bosh-agent/handler" - boshplatform "github.com/cloudfoundry/bosh-agent/platform" - boshsettings "github.com/cloudfoundry/bosh-agent/settings" + boshagentblobstore "github.com/cloudfoundry/bosh-agent/v2/agent/blobstore" + boshhandler "github.com/cloudfoundry/bosh-agent/v2/handler" + boshplatform "github.com/cloudfoundry/bosh-agent/v2/platform" + boshsettings "github.com/cloudfoundry/bosh-agent/v2/settings" bosherr "github.com/cloudfoundry/bosh-utils/errors" boshlog "github.com/cloudfoundry/bosh-utils/logger" ) diff --git a/mbus/handler_provider_test.go b/mbus/handler_provider_test.go index 411e00fa0..aa749f3d0 100644 --- a/mbus/handler_provider_test.go +++ b/mbus/handler_provider_test.go @@ -9,12 +9,12 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/cloudfoundry/bosh-agent/agent/blobstore/blobstorefakes" - "github.com/cloudfoundry/bosh-agent/mbus" - "github.com/cloudfoundry/bosh-agent/mbus/mbusfakes" - "github.com/cloudfoundry/bosh-agent/platform/platformfakes" - "github.com/cloudfoundry/bosh-agent/settings" - fakesettings "github.com/cloudfoundry/bosh-agent/settings/fakes" + "github.com/cloudfoundry/bosh-agent/v2/agent/blobstore/blobstorefakes" + "github.com/cloudfoundry/bosh-agent/v2/mbus" + "github.com/cloudfoundry/bosh-agent/v2/mbus/mbusfakes" + "github.com/cloudfoundry/bosh-agent/v2/platform/platformfakes" + "github.com/cloudfoundry/bosh-agent/v2/settings" + fakesettings "github.com/cloudfoundry/bosh-agent/v2/settings/fakes" boshlog "github.com/cloudfoundry/bosh-utils/logger" ) diff --git a/mbus/https_dispatcher.go b/mbus/https_dispatcher.go index 8b531d8ec..461e73ec9 100644 --- a/mbus/https_dispatcher.go +++ b/mbus/https_dispatcher.go @@ -9,7 +9,7 @@ import ( "net/http" "net/url" - "github.com/cloudfoundry/bosh-agent/settings" + "github.com/cloudfoundry/bosh-agent/v2/settings" bosherr "github.com/cloudfoundry/bosh-utils/errors" boshlog "github.com/cloudfoundry/bosh-utils/logger" diff --git a/mbus/https_dispatcher_test.go b/mbus/https_dispatcher_test.go index 093273515..ff704c23b 100644 --- a/mbus/https_dispatcher_test.go +++ b/mbus/https_dispatcher_test.go @@ -11,8 +11,8 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/cloudfoundry/bosh-agent/mbus" - "github.com/cloudfoundry/bosh-agent/settings" + "github.com/cloudfoundry/bosh-agent/v2/mbus" + "github.com/cloudfoundry/bosh-agent/v2/settings" fakelogger "github.com/cloudfoundry/bosh-utils/logger/loggerfakes" ) diff --git a/mbus/https_handler.go b/mbus/https_handler.go index 18df1a1b9..600b46047 100644 --- a/mbus/https_handler.go +++ b/mbus/https_handler.go @@ -7,11 +7,11 @@ import ( "net/url" "path" - "github.com/cloudfoundry/bosh-agent/platform" - "github.com/cloudfoundry/bosh-agent/settings" + "github.com/cloudfoundry/bosh-agent/v2/platform" + "github.com/cloudfoundry/bosh-agent/v2/settings" - boshagentblobstore "github.com/cloudfoundry/bosh-agent/agent/blobstore" - boshhandler "github.com/cloudfoundry/bosh-agent/handler" + boshagentblobstore "github.com/cloudfoundry/bosh-agent/v2/agent/blobstore" + boshhandler "github.com/cloudfoundry/bosh-agent/v2/handler" bosherr "github.com/cloudfoundry/bosh-utils/errors" boshlog "github.com/cloudfoundry/bosh-utils/logger" ) diff --git a/mbus/https_handler_test.go b/mbus/https_handler_test.go index db9879df8..5410c0a10 100644 --- a/mbus/https_handler_test.go +++ b/mbus/https_handler_test.go @@ -13,11 +13,11 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - boshagentblobstore "github.com/cloudfoundry/bosh-agent/agent/blobstore" - boshhandler "github.com/cloudfoundry/bosh-agent/handler" - "github.com/cloudfoundry/bosh-agent/mbus" - "github.com/cloudfoundry/bosh-agent/platform/fakes" - "github.com/cloudfoundry/bosh-agent/settings" + boshagentblobstore "github.com/cloudfoundry/bosh-agent/v2/agent/blobstore" + boshhandler "github.com/cloudfoundry/bosh-agent/v2/handler" + "github.com/cloudfoundry/bosh-agent/v2/mbus" + "github.com/cloudfoundry/bosh-agent/v2/platform/fakes" + "github.com/cloudfoundry/bosh-agent/v2/settings" boshlog "github.com/cloudfoundry/bosh-utils/logger" ) diff --git a/mbus/mbusfakes/fake_nats_connection.go b/mbus/mbusfakes/fake_nats_connection.go index 5c9f88237..47bed1c01 100644 --- a/mbus/mbusfakes/fake_nats_connection.go +++ b/mbus/mbusfakes/fake_nats_connection.go @@ -4,7 +4,7 @@ package mbusfakes import ( "sync" - "github.com/cloudfoundry/bosh-agent/mbus" + "github.com/cloudfoundry/bosh-agent/v2/mbus" nats "github.com/nats-io/nats.go" ) diff --git a/mbus/nats_handler.go b/mbus/nats_handler.go index e45fe6b3f..3bbbfc259 100644 --- a/mbus/nats_handler.go +++ b/mbus/nats_handler.go @@ -18,9 +18,9 @@ import ( "github.com/nats-io/nats.go" - boshhandler "github.com/cloudfoundry/bosh-agent/handler" - boshplatform "github.com/cloudfoundry/bosh-agent/platform" - boshsettings "github.com/cloudfoundry/bosh-agent/settings" + boshhandler "github.com/cloudfoundry/bosh-agent/v2/handler" + boshplatform "github.com/cloudfoundry/bosh-agent/v2/platform" + boshsettings "github.com/cloudfoundry/bosh-agent/v2/settings" bosherr "github.com/cloudfoundry/bosh-utils/errors" boshlog "github.com/cloudfoundry/bosh-utils/logger" ) @@ -29,7 +29,7 @@ const ( responseMaxLength = 1024 * 1024 natsHandlerLogTag = "NATS Handler" natsMinReconnectSeconds = 2.0 - //natsMaxReconnectSeconds should be lower than the setting we have in BOSH for https://github.com/cloudfoundry/bosh/blob/main/src/bosh-director/lib/bosh/director/agent_client.rb#L44. + // natsMaxReconnectSeconds should be lower than the setting we have in BOSH for https://github.com/cloudfoundry/bosh/blob/main/src/bosh-director/lib/bosh/director/agent_client.rb#L44. natsMaxReconnectSeconds = 10.0 ) diff --git a/mbus/nats_handler_test.go b/mbus/nats_handler_test.go index b15b02671..9d0280aab 100644 --- a/mbus/nats_handler_test.go +++ b/mbus/nats_handler_test.go @@ -13,12 +13,12 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - boshhandler "github.com/cloudfoundry/bosh-agent/handler" - "github.com/cloudfoundry/bosh-agent/mbus" - "github.com/cloudfoundry/bosh-agent/mbus/mbusfakes" - "github.com/cloudfoundry/bosh-agent/platform/platformfakes" - boshsettings "github.com/cloudfoundry/bosh-agent/settings" - fakesettings "github.com/cloudfoundry/bosh-agent/settings/fakes" + boshhandler "github.com/cloudfoundry/bosh-agent/v2/handler" + "github.com/cloudfoundry/bosh-agent/v2/mbus" + "github.com/cloudfoundry/bosh-agent/v2/mbus/mbusfakes" + "github.com/cloudfoundry/bosh-agent/v2/platform/platformfakes" + boshsettings "github.com/cloudfoundry/bosh-agent/v2/settings" + fakesettings "github.com/cloudfoundry/bosh-agent/v2/settings/fakes" boshlog "github.com/cloudfoundry/bosh-utils/logger" ) diff --git a/notification/concrete_notifier.go b/notification/concrete_notifier.go index cce8190d6..a507dd431 100644 --- a/notification/concrete_notifier.go +++ b/notification/concrete_notifier.go @@ -1,7 +1,7 @@ package notification import ( - boshhandler "github.com/cloudfoundry/bosh-agent/handler" + boshhandler "github.com/cloudfoundry/bosh-agent/v2/handler" ) type concreteNotifier struct { diff --git a/notification/concrete_notifier_test.go b/notification/concrete_notifier_test.go index f495515f5..ccec1b61c 100644 --- a/notification/concrete_notifier_test.go +++ b/notification/concrete_notifier_test.go @@ -6,9 +6,9 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - boshhandler "github.com/cloudfoundry/bosh-agent/handler" - fakembus "github.com/cloudfoundry/bosh-agent/mbus/fakes" - . "github.com/cloudfoundry/bosh-agent/notification" + boshhandler "github.com/cloudfoundry/bosh-agent/v2/handler" + fakembus "github.com/cloudfoundry/bosh-agent/v2/mbus/fakes" + . "github.com/cloudfoundry/bosh-agent/v2/notification" ) var _ = Describe("concreteNotifier", func() { diff --git a/platform/bootstrap_state_test.go b/platform/bootstrap_state_test.go index 20568b240..9f79da210 100644 --- a/platform/bootstrap_state_test.go +++ b/platform/bootstrap_state_test.go @@ -6,7 +6,7 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - platform "github.com/cloudfoundry/bosh-agent/platform" + platform "github.com/cloudfoundry/bosh-agent/v2/platform" fakesys "github.com/cloudfoundry/bosh-utils/system/fakes" ) diff --git a/platform/cdrom/cdutil_test.go b/platform/cdrom/cdutil_test.go index decabc2dd..d4e01c21d 100644 --- a/platform/cdrom/cdutil_test.go +++ b/platform/cdrom/cdutil_test.go @@ -4,8 +4,8 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/cloudfoundry/bosh-agent/platform/cdrom" - fakecdrom "github.com/cloudfoundry/bosh-agent/platform/cdrom/fakes" + "github.com/cloudfoundry/bosh-agent/v2/platform/cdrom" + fakecdrom "github.com/cloudfoundry/bosh-agent/v2/platform/cdrom/fakes" boshlog "github.com/cloudfoundry/bosh-utils/logger" fakesys "github.com/cloudfoundry/bosh-utils/system/fakes" ) diff --git a/platform/cdrom/linux_cdrom.go b/platform/cdrom/linux_cdrom.go index c8782fd03..42173112f 100644 --- a/platform/cdrom/linux_cdrom.go +++ b/platform/cdrom/linux_cdrom.go @@ -1,7 +1,7 @@ package cdrom import ( - boshudev "github.com/cloudfoundry/bosh-agent/platform/udevdevice" + boshudev "github.com/cloudfoundry/bosh-agent/v2/platform/udevdevice" bosherr "github.com/cloudfoundry/bosh-utils/errors" boshsys "github.com/cloudfoundry/bosh-utils/system" ) diff --git a/platform/cdrom/linux_cdrom_test.go b/platform/cdrom/linux_cdrom_test.go index b3d77293e..61115e1c8 100644 --- a/platform/cdrom/linux_cdrom_test.go +++ b/platform/cdrom/linux_cdrom_test.go @@ -3,8 +3,8 @@ package cdrom_test import ( "errors" - . "github.com/cloudfoundry/bosh-agent/platform/cdrom" - fakeudev "github.com/cloudfoundry/bosh-agent/platform/udevdevice/fakes" + . "github.com/cloudfoundry/bosh-agent/v2/platform/cdrom" + fakeudev "github.com/cloudfoundry/bosh-agent/v2/platform/udevdevice/fakes" fakesys "github.com/cloudfoundry/bosh-utils/system/fakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/platform/cert/cert_manager_test.go b/platform/cert/cert_manager_test.go index f31373933..7b451703d 100644 --- a/platform/cert/cert_manager_test.go +++ b/platform/cert/cert_manager_test.go @@ -14,8 +14,8 @@ import ( "github.com/onsi/gomega/gbytes" "github.com/onsi/gomega/gexec" - "github.com/cloudfoundry/bosh-agent/platform/cert" - boshdir "github.com/cloudfoundry/bosh-agent/settings/directories" + "github.com/cloudfoundry/bosh-agent/v2/platform/cert" + boshdir "github.com/cloudfoundry/bosh-agent/v2/settings/directories" "github.com/cloudfoundry/bosh-utils/logger" boshsys "github.com/cloudfoundry/bosh-utils/system" fakesys "github.com/cloudfoundry/bosh-utils/system/fakes" diff --git a/platform/cert/certfakes/fake_manager.go b/platform/cert/certfakes/fake_manager.go index 0722df883..e2e58199a 100644 --- a/platform/cert/certfakes/fake_manager.go +++ b/platform/cert/certfakes/fake_manager.go @@ -4,7 +4,7 @@ package certfakes import ( "sync" - "github.com/cloudfoundry/bosh-agent/platform/cert" + "github.com/cloudfoundry/bosh-agent/v2/platform/cert" ) type FakeManager struct { diff --git a/platform/cert/windows_cert_manager.go b/platform/cert/windows_cert_manager.go index f8af7a688..8fc66dce1 100644 --- a/platform/cert/windows_cert_manager.go +++ b/platform/cert/windows_cert_manager.go @@ -7,7 +7,7 @@ import ( "path" "strconv" - boshdir "github.com/cloudfoundry/bosh-agent/settings/directories" + boshdir "github.com/cloudfoundry/bosh-agent/v2/settings/directories" "github.com/cloudfoundry/bosh-utils/logger" boshsys "github.com/cloudfoundry/bosh-utils/system" ) diff --git a/platform/delayed_audit_logger_unix_test.go b/platform/delayed_audit_logger_unix_test.go index a8766057c..fee36dbaa 100644 --- a/platform/delayed_audit_logger_unix_test.go +++ b/platform/delayed_audit_logger_unix_test.go @@ -7,8 +7,8 @@ import ( "errors" "fmt" - "github.com/cloudfoundry/bosh-agent/platform" - "github.com/cloudfoundry/bosh-agent/platform/fakes" + "github.com/cloudfoundry/bosh-agent/v2/platform" + "github.com/cloudfoundry/bosh-agent/v2/platform/fakes" "github.com/cloudfoundry/bosh-utils/logger/loggerfakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/platform/disk/cmd_mounts_searcher_test.go b/platform/disk/cmd_mounts_searcher_test.go index 37fbf9c90..d879c7152 100644 --- a/platform/disk/cmd_mounts_searcher_test.go +++ b/platform/disk/cmd_mounts_searcher_test.go @@ -6,7 +6,7 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/cloudfoundry/bosh-agent/platform/disk" + . "github.com/cloudfoundry/bosh-agent/v2/platform/disk" fakesys "github.com/cloudfoundry/bosh-utils/system/fakes" ) diff --git a/platform/disk/diskfakes/fake_manager.go b/platform/disk/diskfakes/fake_manager.go index f86f73807..713bbd930 100644 --- a/platform/disk/diskfakes/fake_manager.go +++ b/platform/disk/diskfakes/fake_manager.go @@ -4,7 +4,7 @@ package diskfakes import ( "sync" - "github.com/cloudfoundry/bosh-agent/platform/disk" + "github.com/cloudfoundry/bosh-agent/v2/platform/disk" ) type FakeManager struct { diff --git a/platform/disk/diskfakes/fake_mounter.go b/platform/disk/diskfakes/fake_mounter.go index e1f779609..081de5129 100644 --- a/platform/disk/diskfakes/fake_mounter.go +++ b/platform/disk/diskfakes/fake_mounter.go @@ -4,7 +4,7 @@ package diskfakes import ( "sync" - "github.com/cloudfoundry/bosh-agent/platform/disk" + "github.com/cloudfoundry/bosh-agent/v2/platform/disk" ) type FakeMounter struct { diff --git a/platform/disk/diskutil_test.go b/platform/disk/diskutil_test.go index adaec1af7..73c30fcec 100644 --- a/platform/disk/diskutil_test.go +++ b/platform/disk/diskutil_test.go @@ -6,11 +6,11 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/cloudfoundry/bosh-agent/platform/disk/diskfakes" + "github.com/cloudfoundry/bosh-agent/v2/platform/disk/diskfakes" boshlog "github.com/cloudfoundry/bosh-utils/logger" fakesys "github.com/cloudfoundry/bosh-utils/system/fakes" - . "github.com/cloudfoundry/bosh-agent/platform/disk" + . "github.com/cloudfoundry/bosh-agent/v2/platform/disk" ) var _ = Describe("Diskutil", func() { diff --git a/platform/disk/ephemeral_device_partitioner_test.go b/platform/disk/ephemeral_device_partitioner_test.go index 5c23f6786..ddb7531e3 100644 --- a/platform/disk/ephemeral_device_partitioner_test.go +++ b/platform/disk/ephemeral_device_partitioner_test.go @@ -6,8 +6,8 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - fakeboshaction "github.com/cloudfoundry/bosh-agent/agent/action/fakes" - . "github.com/cloudfoundry/bosh-agent/platform/disk" + fakeboshaction "github.com/cloudfoundry/bosh-agent/v2/agent/action/fakes" + . "github.com/cloudfoundry/bosh-agent/v2/platform/disk" boshlog "github.com/cloudfoundry/bosh-utils/logger" fakesys "github.com/cloudfoundry/bosh-utils/system/fakes" ) diff --git a/platform/disk/fakes/fake_formatter.go b/platform/disk/fakes/fake_formatter.go index 35c7fb19a..956891334 100644 --- a/platform/disk/fakes/fake_formatter.go +++ b/platform/disk/fakes/fake_formatter.go @@ -1,7 +1,7 @@ package fakes import ( - boshdisk "github.com/cloudfoundry/bosh-agent/platform/disk" + boshdisk "github.com/cloudfoundry/bosh-agent/v2/platform/disk" ) type FakeFormatter struct { diff --git a/platform/disk/fakes/fake_mounts_seacher.go b/platform/disk/fakes/fake_mounts_seacher.go index 3bc1d5a9e..b3425da6e 100644 --- a/platform/disk/fakes/fake_mounts_seacher.go +++ b/platform/disk/fakes/fake_mounts_seacher.go @@ -1,7 +1,7 @@ package fakes import ( - boshdisk "github.com/cloudfoundry/bosh-agent/platform/disk" + boshdisk "github.com/cloudfoundry/bosh-agent/v2/platform/disk" ) type FakeMountsSearcher struct { diff --git a/platform/disk/fakes/fake_partitioner.go b/platform/disk/fakes/fake_partitioner.go index e1e0ed3d5..70d4ec0da 100644 --- a/platform/disk/fakes/fake_partitioner.go +++ b/platform/disk/fakes/fake_partitioner.go @@ -1,7 +1,7 @@ package fakes import ( - boshdisk "github.com/cloudfoundry/bosh-agent/platform/disk" + boshdisk "github.com/cloudfoundry/bosh-agent/v2/platform/disk" ) type FakePartitioner struct { diff --git a/platform/disk/linux_bind_mounter_test.go b/platform/disk/linux_bind_mounter_test.go index bd08cdc32..a95248a9f 100644 --- a/platform/disk/linux_bind_mounter_test.go +++ b/platform/disk/linux_bind_mounter_test.go @@ -6,8 +6,8 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/cloudfoundry/bosh-agent/platform/disk" - "github.com/cloudfoundry/bosh-agent/platform/disk/diskfakes" + . "github.com/cloudfoundry/bosh-agent/v2/platform/disk" + "github.com/cloudfoundry/bosh-agent/v2/platform/disk/diskfakes" ) var _ = Describe("linuxBindMounter", func() { diff --git a/platform/disk/linux_disk_manager_test.go b/platform/disk/linux_disk_manager_test.go index 7e6770f4f..a58964633 100644 --- a/platform/disk/linux_disk_manager_test.go +++ b/platform/disk/linux_disk_manager_test.go @@ -4,7 +4,7 @@ import ( "time" "code.cloudfoundry.org/clock" - "github.com/cloudfoundry/bosh-agent/platform/disk" + "github.com/cloudfoundry/bosh-agent/v2/platform/disk" boshlog "github.com/cloudfoundry/bosh-utils/logger" fakesys "github.com/cloudfoundry/bosh-utils/system/fakes" . "github.com/onsi/ginkgo/v2" diff --git a/platform/disk/linux_formatter_test.go b/platform/disk/linux_formatter_test.go index 8f718ea94..f2e83aca4 100644 --- a/platform/disk/linux_formatter_test.go +++ b/platform/disk/linux_formatter_test.go @@ -7,7 +7,7 @@ import ( "errors" "fmt" - . "github.com/cloudfoundry/bosh-agent/platform/disk" + . "github.com/cloudfoundry/bosh-agent/v2/platform/disk" fakesys "github.com/cloudfoundry/bosh-utils/system/fakes" ) diff --git a/platform/disk/linux_mounter_test.go b/platform/disk/linux_mounter_test.go index 5e61fa447..02ec84c6d 100644 --- a/platform/disk/linux_mounter_test.go +++ b/platform/disk/linux_mounter_test.go @@ -7,8 +7,8 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/cloudfoundry/bosh-agent/platform/disk" - fakedisk "github.com/cloudfoundry/bosh-agent/platform/disk/fakes" + . "github.com/cloudfoundry/bosh-agent/v2/platform/disk" + fakedisk "github.com/cloudfoundry/bosh-agent/v2/platform/disk/fakes" fakesys "github.com/cloudfoundry/bosh-utils/system/fakes" ) diff --git a/platform/disk/parted_partitioner_test.go b/platform/disk/parted_partitioner_test.go index 71a10db5c..240af8551 100644 --- a/platform/disk/parted_partitioner_test.go +++ b/platform/disk/parted_partitioner_test.go @@ -7,8 +7,8 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - fakeboshaction "github.com/cloudfoundry/bosh-agent/agent/action/fakes" - . "github.com/cloudfoundry/bosh-agent/platform/disk" + fakeboshaction "github.com/cloudfoundry/bosh-agent/v2/agent/action/fakes" + . "github.com/cloudfoundry/bosh-agent/v2/platform/disk" boshlog "github.com/cloudfoundry/bosh-utils/logger" fakesys "github.com/cloudfoundry/bosh-utils/system/fakes" ) diff --git a/platform/disk/persistent_device_partitioner_test.go b/platform/disk/persistent_device_partitioner_test.go index a69db8f84..79db56db1 100644 --- a/platform/disk/persistent_device_partitioner_test.go +++ b/platform/disk/persistent_device_partitioner_test.go @@ -3,8 +3,8 @@ package disk_test import ( "errors" - "github.com/cloudfoundry/bosh-agent/platform/disk" - "github.com/cloudfoundry/bosh-agent/platform/disk/fakes" + "github.com/cloudfoundry/bosh-agent/v2/platform/disk" + "github.com/cloudfoundry/bosh-agent/v2/platform/disk/fakes" "github.com/cloudfoundry/bosh-utils/logger" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/platform/disk/proc_mounts_searcher_test.go b/platform/disk/proc_mounts_searcher_test.go index 8fc400607..539436fd2 100644 --- a/platform/disk/proc_mounts_searcher_test.go +++ b/platform/disk/proc_mounts_searcher_test.go @@ -6,7 +6,7 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/cloudfoundry/bosh-agent/platform/disk" + . "github.com/cloudfoundry/bosh-agent/v2/platform/disk" fakesys "github.com/cloudfoundry/bosh-utils/system/fakes" ) diff --git a/platform/disk/root_device_partitioner_test.go b/platform/disk/root_device_partitioner_test.go index 95d8e7fac..e0b50b2b0 100644 --- a/platform/disk/root_device_partitioner_test.go +++ b/platform/disk/root_device_partitioner_test.go @@ -6,7 +6,7 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/cloudfoundry/bosh-agent/platform/disk" + . "github.com/cloudfoundry/bosh-agent/v2/platform/disk" boshlog "github.com/cloudfoundry/bosh-utils/logger" fakesys "github.com/cloudfoundry/bosh-utils/system/fakes" ) diff --git a/platform/disk/sfdisk_partitioner_test.go b/platform/disk/sfdisk_partitioner_test.go index 27fdce05c..4c2da195a 100644 --- a/platform/disk/sfdisk_partitioner_test.go +++ b/platform/disk/sfdisk_partitioner_test.go @@ -7,8 +7,8 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - fakeboshaction "github.com/cloudfoundry/bosh-agent/agent/action/fakes" - . "github.com/cloudfoundry/bosh-agent/platform/disk" + fakeboshaction "github.com/cloudfoundry/bosh-agent/v2/agent/action/fakes" + . "github.com/cloudfoundry/bosh-agent/v2/platform/disk" boshlog "github.com/cloudfoundry/bosh-utils/logger" fakesys "github.com/cloudfoundry/bosh-utils/system/fakes" ) diff --git a/platform/dummy_platform.go b/platform/dummy_platform.go index c0ca85c37..d4c141b17 100644 --- a/platform/dummy_platform.go +++ b/platform/dummy_platform.go @@ -12,14 +12,14 @@ import ( boshlog "github.com/cloudfoundry/bosh-utils/logger" boshsys "github.com/cloudfoundry/bosh-utils/system" - boshlogstarprovider "github.com/cloudfoundry/bosh-agent/agent/logstarprovider" - boshdpresolv "github.com/cloudfoundry/bosh-agent/infrastructure/devicepathresolver" - boshcert "github.com/cloudfoundry/bosh-agent/platform/cert" - boshstats "github.com/cloudfoundry/bosh-agent/platform/stats" - boshvitals "github.com/cloudfoundry/bosh-agent/platform/vitals" - "github.com/cloudfoundry/bosh-agent/servicemanager" - boshsettings "github.com/cloudfoundry/bosh-agent/settings" - boshdirs "github.com/cloudfoundry/bosh-agent/settings/directories" + boshlogstarprovider "github.com/cloudfoundry/bosh-agent/v2/agent/logstarprovider" + boshdpresolv "github.com/cloudfoundry/bosh-agent/v2/infrastructure/devicepathresolver" + boshcert "github.com/cloudfoundry/bosh-agent/v2/platform/cert" + boshstats "github.com/cloudfoundry/bosh-agent/v2/platform/stats" + boshvitals "github.com/cloudfoundry/bosh-agent/v2/platform/vitals" + "github.com/cloudfoundry/bosh-agent/v2/servicemanager" + boshsettings "github.com/cloudfoundry/bosh-agent/v2/settings" + boshdirs "github.com/cloudfoundry/bosh-agent/v2/settings/directories" ) type mount struct { diff --git a/platform/dummy_platform_test.go b/platform/dummy_platform_test.go index 90d4acf68..01edd6a9b 100644 --- a/platform/dummy_platform_test.go +++ b/platform/dummy_platform_test.go @@ -5,24 +5,24 @@ import ( "os" "path/filepath" - "github.com/cloudfoundry/bosh-agent/agent/logstarprovider/logstarproviderfakes" + "github.com/cloudfoundry/bosh-agent/v2/agent/logstarprovider/logstarproviderfakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/cloudfoundry/bosh-agent/platform" + . "github.com/cloudfoundry/bosh-agent/v2/platform" boshlog "github.com/cloudfoundry/bosh-utils/logger" boshsys "github.com/cloudfoundry/bosh-utils/system" fakesys "github.com/cloudfoundry/bosh-utils/system/fakes" - boshdpresolv "github.com/cloudfoundry/bosh-agent/infrastructure/devicepathresolver" - fakedpresolv "github.com/cloudfoundry/bosh-agent/infrastructure/devicepathresolver/fakes" - "github.com/cloudfoundry/bosh-agent/platform/fakes" - boshstats "github.com/cloudfoundry/bosh-agent/platform/stats" - fakestats "github.com/cloudfoundry/bosh-agent/platform/stats/fakes" - boshsettings "github.com/cloudfoundry/bosh-agent/settings" - boshdirs "github.com/cloudfoundry/bosh-agent/settings/directories" + boshdpresolv "github.com/cloudfoundry/bosh-agent/v2/infrastructure/devicepathresolver" + fakedpresolv "github.com/cloudfoundry/bosh-agent/v2/infrastructure/devicepathresolver/fakes" + "github.com/cloudfoundry/bosh-agent/v2/platform/fakes" + boshstats "github.com/cloudfoundry/bosh-agent/v2/platform/stats" + fakestats "github.com/cloudfoundry/bosh-agent/v2/platform/stats/fakes" + boshsettings "github.com/cloudfoundry/bosh-agent/v2/settings" + boshdirs "github.com/cloudfoundry/bosh-agent/v2/settings/directories" ) type mount struct { diff --git a/platform/fakes/fake_windows_disk_manager.go b/platform/fakes/fake_windows_disk_manager.go index baca44935..f73275b06 100644 --- a/platform/fakes/fake_windows_disk_manager.go +++ b/platform/fakes/fake_windows_disk_manager.go @@ -4,8 +4,8 @@ package fakes import ( "sync" - "github.com/cloudfoundry/bosh-agent/platform" - "github.com/cloudfoundry/bosh-agent/platform/windows/disk" + "github.com/cloudfoundry/bosh-agent/v2/platform" + "github.com/cloudfoundry/bosh-agent/v2/platform/windows/disk" ) type FakeWindowsDiskManager struct { diff --git a/platform/linux_platform.go b/platform/linux_platform.go index 9fe5796c9..3dadd15e4 100644 --- a/platform/linux_platform.go +++ b/platform/linux_platform.go @@ -18,17 +18,17 @@ import ( boshsys "github.com/cloudfoundry/bosh-utils/system" boshuuid "github.com/cloudfoundry/bosh-utils/uuid" - boshlogstarprovider "github.com/cloudfoundry/bosh-agent/agent/logstarprovider" - boshdpresolv "github.com/cloudfoundry/bosh-agent/infrastructure/devicepathresolver" - "github.com/cloudfoundry/bosh-agent/platform/cdrom" - boshcert "github.com/cloudfoundry/bosh-agent/platform/cert" - boshdisk "github.com/cloudfoundry/bosh-agent/platform/disk" - boshnet "github.com/cloudfoundry/bosh-agent/platform/net" - boshstats "github.com/cloudfoundry/bosh-agent/platform/stats" - boshvitals "github.com/cloudfoundry/bosh-agent/platform/vitals" - "github.com/cloudfoundry/bosh-agent/servicemanager" - boshsettings "github.com/cloudfoundry/bosh-agent/settings" - boshdirs "github.com/cloudfoundry/bosh-agent/settings/directories" + boshlogstarprovider "github.com/cloudfoundry/bosh-agent/v2/agent/logstarprovider" + boshdpresolv "github.com/cloudfoundry/bosh-agent/v2/infrastructure/devicepathresolver" + "github.com/cloudfoundry/bosh-agent/v2/platform/cdrom" + boshcert "github.com/cloudfoundry/bosh-agent/v2/platform/cert" + boshdisk "github.com/cloudfoundry/bosh-agent/v2/platform/disk" + boshnet "github.com/cloudfoundry/bosh-agent/v2/platform/net" + boshstats "github.com/cloudfoundry/bosh-agent/v2/platform/stats" + boshvitals "github.com/cloudfoundry/bosh-agent/v2/platform/vitals" + "github.com/cloudfoundry/bosh-agent/v2/servicemanager" + boshsettings "github.com/cloudfoundry/bosh-agent/v2/settings" + boshdirs "github.com/cloudfoundry/bosh-agent/v2/settings/directories" ) const ( diff --git a/platform/linux_platform_test.go b/platform/linux_platform_test.go index 82423502a..5690b878f 100644 --- a/platform/linux_platform_test.go +++ b/platform/linux_platform_test.go @@ -12,30 +12,30 @@ import ( "strconv" "strings" - fakelogstarprovider "github.com/cloudfoundry/bosh-agent/agent/logstarprovider/logstarproviderfakes" + fakelogstarprovider "github.com/cloudfoundry/bosh-agent/v2/agent/logstarprovider/logstarproviderfakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/cloudfoundry/bosh-agent/platform" - - fakedpresolv "github.com/cloudfoundry/bosh-agent/infrastructure/devicepathresolver/fakes" - fakecdrom "github.com/cloudfoundry/bosh-agent/platform/cdrom/fakes" - "github.com/cloudfoundry/bosh-agent/platform/cert/certfakes" - "github.com/cloudfoundry/bosh-agent/platform/disk/diskfakes" - fakedisk "github.com/cloudfoundry/bosh-agent/platform/disk/fakes" - fakeplat "github.com/cloudfoundry/bosh-agent/platform/fakes" - fakenet "github.com/cloudfoundry/bosh-agent/platform/net/fakes" - fakestats "github.com/cloudfoundry/bosh-agent/platform/stats/fakes" - "github.com/cloudfoundry/bosh-agent/servicemanager/servicemanagerfakes" + . "github.com/cloudfoundry/bosh-agent/v2/platform" + + fakedpresolv "github.com/cloudfoundry/bosh-agent/v2/infrastructure/devicepathresolver/fakes" + fakecdrom "github.com/cloudfoundry/bosh-agent/v2/platform/cdrom/fakes" + "github.com/cloudfoundry/bosh-agent/v2/platform/cert/certfakes" + "github.com/cloudfoundry/bosh-agent/v2/platform/disk/diskfakes" + fakedisk "github.com/cloudfoundry/bosh-agent/v2/platform/disk/fakes" + fakeplat "github.com/cloudfoundry/bosh-agent/v2/platform/fakes" + fakenet "github.com/cloudfoundry/bosh-agent/v2/platform/net/fakes" + fakestats "github.com/cloudfoundry/bosh-agent/v2/platform/stats/fakes" + "github.com/cloudfoundry/bosh-agent/v2/servicemanager/servicemanagerfakes" fakeretry "github.com/cloudfoundry/bosh-utils/retrystrategy/fakes" fakesys "github.com/cloudfoundry/bosh-utils/system/fakes" fakeuuidgen "github.com/cloudfoundry/bosh-utils/uuid/fakes" - boshdisk "github.com/cloudfoundry/bosh-agent/platform/disk" - boshvitals "github.com/cloudfoundry/bosh-agent/platform/vitals" - boshsettings "github.com/cloudfoundry/bosh-agent/settings" - boshdirs "github.com/cloudfoundry/bosh-agent/settings/directories" + boshdisk "github.com/cloudfoundry/bosh-agent/v2/platform/disk" + boshvitals "github.com/cloudfoundry/bosh-agent/v2/platform/vitals" + boshsettings "github.com/cloudfoundry/bosh-agent/v2/settings" + boshdirs "github.com/cloudfoundry/bosh-agent/v2/settings/directories" boshcmd "github.com/cloudfoundry/bosh-utils/fileutil" boshlog "github.com/cloudfoundry/bosh-utils/logger" boshsys "github.com/cloudfoundry/bosh-utils/system" diff --git a/platform/monit_retryable.go b/platform/monit_retryable.go index 30a0f7340..2ebc2f12c 100644 --- a/platform/monit_retryable.go +++ b/platform/monit_retryable.go @@ -1,7 +1,7 @@ package platform import ( - "github.com/cloudfoundry/bosh-agent/servicemanager" + "github.com/cloudfoundry/bosh-agent/v2/servicemanager" bosherr "github.com/cloudfoundry/bosh-utils/errors" boshretry "github.com/cloudfoundry/bosh-utils/retrystrategy" ) diff --git a/platform/monit_retryable_test.go b/platform/monit_retryable_test.go index dba4bfe85..3993c8c2d 100644 --- a/platform/monit_retryable_test.go +++ b/platform/monit_retryable_test.go @@ -6,8 +6,8 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/cloudfoundry/bosh-agent/platform" - "github.com/cloudfoundry/bosh-agent/servicemanager/servicemanagerfakes" + . "github.com/cloudfoundry/bosh-agent/v2/platform" + "github.com/cloudfoundry/bosh-agent/v2/servicemanager/servicemanagerfakes" boshretry "github.com/cloudfoundry/bosh-utils/retrystrategy" ) diff --git a/platform/net/arp/address_broadcaster_interface.go b/platform/net/arp/address_broadcaster_interface.go index 20e483c3a..842738165 100644 --- a/platform/net/arp/address_broadcaster_interface.go +++ b/platform/net/arp/address_broadcaster_interface.go @@ -1,7 +1,7 @@ package arp import ( - boship "github.com/cloudfoundry/bosh-agent/platform/net/ip" + boship "github.com/cloudfoundry/bosh-agent/v2/platform/net/ip" ) type AddressBroadcaster interface { diff --git a/platform/net/arp/arping.go b/platform/net/arp/arping.go index e288c3a34..bd2d7525a 100644 --- a/platform/net/arp/arping.go +++ b/platform/net/arp/arping.go @@ -6,7 +6,7 @@ import ( "sync" "time" - boship "github.com/cloudfoundry/bosh-agent/platform/net/ip" + boship "github.com/cloudfoundry/bosh-agent/v2/platform/net/ip" boshlog "github.com/cloudfoundry/bosh-utils/logger" boshsys "github.com/cloudfoundry/bosh-utils/system" ) diff --git a/platform/net/arp/arping_test.go b/platform/net/arp/arping_test.go index 6ab8d87fb..d99c77936 100644 --- a/platform/net/arp/arping_test.go +++ b/platform/net/arp/arping_test.go @@ -8,8 +8,8 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/cloudfoundry/bosh-agent/platform/net/arp" - boship "github.com/cloudfoundry/bosh-agent/platform/net/ip" + . "github.com/cloudfoundry/bosh-agent/v2/platform/net/arp" + boship "github.com/cloudfoundry/bosh-agent/v2/platform/net/ip" boshlog "github.com/cloudfoundry/bosh-utils/logger" fakesys "github.com/cloudfoundry/bosh-utils/system/fakes" ) diff --git a/platform/net/arp/fakes/fake_address_broadcaster.go b/platform/net/arp/fakes/fake_address_broadcaster.go index c1650aecd..3ea39e128 100644 --- a/platform/net/arp/fakes/fake_address_broadcaster.go +++ b/platform/net/arp/fakes/fake_address_broadcaster.go @@ -3,7 +3,7 @@ package fakes import ( "sync" - boship "github.com/cloudfoundry/bosh-agent/platform/net/ip" + boship "github.com/cloudfoundry/bosh-agent/v2/platform/net/ip" ) type FakeAddressBroadcaster struct { diff --git a/platform/net/centos_net_manager.go b/platform/net/centos_net_manager.go index c67bb0851..d63200bd4 100644 --- a/platform/net/centos_net_manager.go +++ b/platform/net/centos_net_manager.go @@ -8,10 +8,10 @@ import ( "text/template" "time" - bosharp "github.com/cloudfoundry/bosh-agent/platform/net/arp" - boshdnsresolver "github.com/cloudfoundry/bosh-agent/platform/net/dnsresolver" - boship "github.com/cloudfoundry/bosh-agent/platform/net/ip" - boshsettings "github.com/cloudfoundry/bosh-agent/settings" + bosharp "github.com/cloudfoundry/bosh-agent/v2/platform/net/arp" + boshdnsresolver "github.com/cloudfoundry/bosh-agent/v2/platform/net/dnsresolver" + boship "github.com/cloudfoundry/bosh-agent/v2/platform/net/ip" + boshsettings "github.com/cloudfoundry/bosh-agent/v2/settings" bosherr "github.com/cloudfoundry/bosh-utils/errors" boshlog "github.com/cloudfoundry/bosh-utils/logger" boshretry "github.com/cloudfoundry/bosh-utils/retrystrategy" diff --git a/platform/net/centos_net_manager_test.go b/platform/net/centos_net_manager_test.go index 2a911aae8..10eed7230 100644 --- a/platform/net/centos_net_manager_test.go +++ b/platform/net/centos_net_manager_test.go @@ -14,13 +14,13 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/cloudfoundry/bosh-agent/platform/net" - fakearp "github.com/cloudfoundry/bosh-agent/platform/net/arp/fakes" - fakednsresolver "github.com/cloudfoundry/bosh-agent/platform/net/dnsresolver/fakes" - boship "github.com/cloudfoundry/bosh-agent/platform/net/ip" - fakeip "github.com/cloudfoundry/bosh-agent/platform/net/ip/fakes" - "github.com/cloudfoundry/bosh-agent/platform/net/netfakes" - boshsettings "github.com/cloudfoundry/bosh-agent/settings" + . "github.com/cloudfoundry/bosh-agent/v2/platform/net" + fakearp "github.com/cloudfoundry/bosh-agent/v2/platform/net/arp/fakes" + fakednsresolver "github.com/cloudfoundry/bosh-agent/v2/platform/net/dnsresolver/fakes" + boship "github.com/cloudfoundry/bosh-agent/v2/platform/net/ip" + fakeip "github.com/cloudfoundry/bosh-agent/v2/platform/net/ip/fakes" + "github.com/cloudfoundry/bosh-agent/v2/platform/net/netfakes" + boshsettings "github.com/cloudfoundry/bosh-agent/v2/settings" boshlog "github.com/cloudfoundry/bosh-utils/logger" fakesys "github.com/cloudfoundry/bosh-utils/system/fakes" ) @@ -208,7 +208,7 @@ nameserver 9.9.9.9 "ethstatic": staticNetwork, }) - staticNetwork.Netmask = "not an ip" //will cause InterfaceConfigurationCreator to fail + staticNetwork.Netmask = "not an ip" // will cause InterfaceConfigurationCreator to fail err := netManager.SetupNetworking(boshsettings.Networks{"static-network": staticNetwork}, "", nil) Expect(err).To(HaveOccurred()) Expect(err.Error()).To(ContainSubstring("Creating interface configurations")) diff --git a/platform/net/default_network_resolver.go b/platform/net/default_network_resolver.go index a251ebab5..24ba7510a 100644 --- a/platform/net/default_network_resolver.go +++ b/platform/net/default_network_resolver.go @@ -3,8 +3,8 @@ package net import ( gonet "net" - boship "github.com/cloudfoundry/bosh-agent/platform/net/ip" - boshsettings "github.com/cloudfoundry/bosh-agent/settings" + boship "github.com/cloudfoundry/bosh-agent/v2/platform/net/ip" + boshsettings "github.com/cloudfoundry/bosh-agent/v2/settings" bosherr "github.com/cloudfoundry/bosh-utils/errors" ) diff --git a/platform/net/default_network_resolver_test.go b/platform/net/default_network_resolver_test.go index b0bdb3464..2ff8ca156 100644 --- a/platform/net/default_network_resolver_test.go +++ b/platform/net/default_network_resolver_test.go @@ -7,10 +7,10 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/cloudfoundry/bosh-agent/platform/net" - fakenet "github.com/cloudfoundry/bosh-agent/platform/net/fakes" - fakeip "github.com/cloudfoundry/bosh-agent/platform/net/ip/fakes" - boshsettings "github.com/cloudfoundry/bosh-agent/settings" + . "github.com/cloudfoundry/bosh-agent/v2/platform/net" + fakenet "github.com/cloudfoundry/bosh-agent/v2/platform/net/fakes" + fakeip "github.com/cloudfoundry/bosh-agent/v2/platform/net/ip/fakes" + boshsettings "github.com/cloudfoundry/bosh-agent/v2/settings" ) var _ = Describe("defaultNetworkResolver", func() { diff --git a/platform/net/dnsresolver/dns_resolveconf_resolver_test.go b/platform/net/dnsresolver/dns_resolveconf_resolver_test.go index 9edfc11f5..e2c6de8d8 100644 --- a/platform/net/dnsresolver/dns_resolveconf_resolver_test.go +++ b/platform/net/dnsresolver/dns_resolveconf_resolver_test.go @@ -8,7 +8,7 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/cloudfoundry/bosh-agent/platform/net/dnsresolver" + . "github.com/cloudfoundry/bosh-agent/v2/platform/net/dnsresolver" ) var _ = Describe("resolveConfResolver", func() { diff --git a/platform/net/dnsresolver/dns_systemd_resolver_test.go b/platform/net/dnsresolver/dns_systemd_resolver_test.go index 7f0fcd983..3870b7d49 100644 --- a/platform/net/dnsresolver/dns_systemd_resolver_test.go +++ b/platform/net/dnsresolver/dns_systemd_resolver_test.go @@ -6,7 +6,7 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/cloudfoundry/bosh-agent/platform/net/dnsresolver" + . "github.com/cloudfoundry/bosh-agent/v2/platform/net/dnsresolver" ) var _ = Describe("systemdConfResolver", func() { diff --git a/platform/net/fakes/fake_default_network_resolver.go b/platform/net/fakes/fake_default_network_resolver.go index afea1d370..222c46625 100644 --- a/platform/net/fakes/fake_default_network_resolver.go +++ b/platform/net/fakes/fake_default_network_resolver.go @@ -1,7 +1,7 @@ package fakes import ( - boshsettings "github.com/cloudfoundry/bosh-agent/settings" + boshsettings "github.com/cloudfoundry/bosh-agent/v2/settings" ) type FakeDefaultNetworkResolver struct { diff --git a/platform/net/fakes/fake_interface_manager.go b/platform/net/fakes/fake_interface_manager.go index cb499e132..2bb2385a4 100644 --- a/platform/net/fakes/fake_interface_manager.go +++ b/platform/net/fakes/fake_interface_manager.go @@ -1,7 +1,7 @@ package fakes import ( - boshnet "github.com/cloudfoundry/bosh-agent/platform/net" + boshnet "github.com/cloudfoundry/bosh-agent/v2/platform/net" ) type FakeInterfaceManager struct { diff --git a/platform/net/fakes/fake_net_manager.go b/platform/net/fakes/fake_net_manager.go index f3fc42a3e..828d520fc 100644 --- a/platform/net/fakes/fake_net_manager.go +++ b/platform/net/fakes/fake_net_manager.go @@ -1,7 +1,7 @@ package fakes import ( - boshsettings "github.com/cloudfoundry/bosh-agent/settings" + boshsettings "github.com/cloudfoundry/bosh-agent/v2/settings" ) type FakeManager struct { diff --git a/platform/net/fakes/fake_routes_searcher.go b/platform/net/fakes/fake_routes_searcher.go index 71a3d0eb1..94499dec0 100644 --- a/platform/net/fakes/fake_routes_searcher.go +++ b/platform/net/fakes/fake_routes_searcher.go @@ -1,7 +1,7 @@ package fakes import ( - boshnet "github.com/cloudfoundry/bosh-agent/platform/net" + boshnet "github.com/cloudfoundry/bosh-agent/v2/platform/net" ) type FakeRoutesSearcher struct { diff --git a/platform/net/interface_configuration_creator.go b/platform/net/interface_configuration_creator.go index 48651bcb0..f25ea125a 100644 --- a/platform/net/interface_configuration_creator.go +++ b/platform/net/interface_configuration_creator.go @@ -3,7 +3,7 @@ package net import ( "net" - boshsettings "github.com/cloudfoundry/bosh-agent/settings" + boshsettings "github.com/cloudfoundry/bosh-agent/v2/settings" bosherr "github.com/cloudfoundry/bosh-utils/errors" boshlog "github.com/cloudfoundry/bosh-utils/logger" boshsys "github.com/cloudfoundry/bosh-utils/system" diff --git a/platform/net/interface_configuration_creator_test.go b/platform/net/interface_configuration_creator_test.go index fec533e80..95b539d38 100644 --- a/platform/net/interface_configuration_creator_test.go +++ b/platform/net/interface_configuration_creator_test.go @@ -4,9 +4,9 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/cloudfoundry/bosh-agent/platform/net" + . "github.com/cloudfoundry/bosh-agent/v2/platform/net" - boshsettings "github.com/cloudfoundry/bosh-agent/settings" + boshsettings "github.com/cloudfoundry/bosh-agent/v2/settings" boshlog "github.com/cloudfoundry/bosh-utils/logger" ) diff --git a/platform/net/ip/fakes/fake_interface_addresses_provider.go b/platform/net/ip/fakes/fake_interface_addresses_provider.go index f712d40a5..e419215c9 100644 --- a/platform/net/ip/fakes/fake_interface_addresses_provider.go +++ b/platform/net/ip/fakes/fake_interface_addresses_provider.go @@ -1,7 +1,7 @@ package fakes import ( - boship "github.com/cloudfoundry/bosh-agent/platform/net/ip" + boship "github.com/cloudfoundry/bosh-agent/v2/platform/net/ip" ) type FakeInterfaceAddressesProvider struct { diff --git a/platform/net/ip/interface_address_test.go b/platform/net/ip/interface_address_test.go index 72045c779..9ef144608 100644 --- a/platform/net/ip/interface_address_test.go +++ b/platform/net/ip/interface_address_test.go @@ -7,8 +7,8 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/cloudfoundry/bosh-agent/platform/net/ip" - fakeip "github.com/cloudfoundry/bosh-agent/platform/net/ip/fakes" + . "github.com/cloudfoundry/bosh-agent/v2/platform/net/ip" + fakeip "github.com/cloudfoundry/bosh-agent/v2/platform/net/ip/fakes" ) var _ = Describe("simpleInterfaceAddress", func() { diff --git a/platform/net/ip/interface_addresses_provider_test.go b/platform/net/ip/interface_addresses_provider_test.go index 7b55d642f..adcfadd3a 100644 --- a/platform/net/ip/interface_addresses_provider_test.go +++ b/platform/net/ip/interface_addresses_provider_test.go @@ -1,7 +1,7 @@ package ip_test import ( - . "github.com/cloudfoundry/bosh-agent/platform/net/ip" + . "github.com/cloudfoundry/bosh-agent/v2/platform/net/ip" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/platform/net/ip/interface_addresses_validator_test.go b/platform/net/ip/interface_addresses_validator_test.go index 2f95f8bca..400e0acb4 100644 --- a/platform/net/ip/interface_addresses_validator_test.go +++ b/platform/net/ip/interface_addresses_validator_test.go @@ -6,8 +6,8 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - boship "github.com/cloudfoundry/bosh-agent/platform/net/ip" - fakeip "github.com/cloudfoundry/bosh-agent/platform/net/ip/fakes" + boship "github.com/cloudfoundry/bosh-agent/v2/platform/net/ip" + fakeip "github.com/cloudfoundry/bosh-agent/v2/platform/net/ip/fakes" ) var _ = Describe("InterfaceAddressesValidator", func() { diff --git a/platform/net/ip/ip_resolver_test.go b/platform/net/ip/ip_resolver_test.go index 2c0dc2ae7..9df3e7355 100644 --- a/platform/net/ip/ip_resolver_test.go +++ b/platform/net/ip/ip_resolver_test.go @@ -7,7 +7,7 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/cloudfoundry/bosh-agent/platform/net/ip" + . "github.com/cloudfoundry/bosh-agent/v2/platform/net/ip" ) type NotIPNet struct{} diff --git a/platform/net/kernel_ipv6_test.go b/platform/net/kernel_ipv6_test.go index 6ec8f56a5..c57531a7c 100644 --- a/platform/net/kernel_ipv6_test.go +++ b/platform/net/kernel_ipv6_test.go @@ -6,7 +6,7 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/cloudfoundry/bosh-agent/platform/net" + . "github.com/cloudfoundry/bosh-agent/v2/platform/net" boshlog "github.com/cloudfoundry/bosh-utils/logger" fakesys "github.com/cloudfoundry/bosh-utils/system/fakes" ) diff --git a/platform/net/lock_file.go b/platform/net/lock_file.go index f2ab151c5..078692155 100644 --- a/platform/net/lock_file.go +++ b/platform/net/lock_file.go @@ -5,7 +5,7 @@ import ( "path/filepath" "github.com/charlievieth/fs" - boshdirs "github.com/cloudfoundry/bosh-agent/settings/directories" + boshdirs "github.com/cloudfoundry/bosh-agent/v2/settings/directories" bosherr "github.com/cloudfoundry/bosh-utils/errors" boshlog "github.com/cloudfoundry/bosh-utils/logger" boshsys "github.com/cloudfoundry/bosh-utils/system" diff --git a/platform/net/mac_address_detector_test.go b/platform/net/mac_address_detector_test.go index c033b71d7..d71d86f62 100644 --- a/platform/net/mac_address_detector_test.go +++ b/platform/net/mac_address_detector_test.go @@ -9,7 +9,7 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/cloudfoundry/bosh-agent/platform/net" + . "github.com/cloudfoundry/bosh-agent/v2/platform/net" fakesys "github.com/cloudfoundry/bosh-utils/system/fakes" ) diff --git a/platform/net/net_manager_interface.go b/platform/net/net_manager_interface.go index 8438802b7..699d9d7da 100644 --- a/platform/net/net_manager_interface.go +++ b/platform/net/net_manager_interface.go @@ -1,7 +1,7 @@ package net import ( - boshsettings "github.com/cloudfoundry/bosh-agent/settings" + boshsettings "github.com/cloudfoundry/bosh-agent/v2/settings" ) type Manager interface { diff --git a/platform/net/netfakes/fake_macaddress_detector.go b/platform/net/netfakes/fake_macaddress_detector.go index 8a11f054b..55d5ee98c 100644 --- a/platform/net/netfakes/fake_macaddress_detector.go +++ b/platform/net/netfakes/fake_macaddress_detector.go @@ -4,7 +4,7 @@ package netfakes import ( "sync" - "github.com/cloudfoundry/bosh-agent/platform/net" + "github.com/cloudfoundry/bosh-agent/v2/platform/net" ) type FakeMACAddressDetector struct { diff --git a/platform/net/routes_searcher_interface_test.go b/platform/net/routes_searcher_interface_test.go index 3d85eb8b1..15b69682d 100644 --- a/platform/net/routes_searcher_interface_test.go +++ b/platform/net/routes_searcher_interface_test.go @@ -4,7 +4,7 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/cloudfoundry/bosh-agent/platform/net" + . "github.com/cloudfoundry/bosh-agent/v2/platform/net" ) var _ = Describe("Route", func() { diff --git a/platform/net/routes_searcher_unix_test.go b/platform/net/routes_searcher_unix_test.go index 1aed2fdb0..7d7432b85 100644 --- a/platform/net/routes_searcher_unix_test.go +++ b/platform/net/routes_searcher_unix_test.go @@ -9,7 +9,7 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/cloudfoundry/bosh-agent/platform/net" + . "github.com/cloudfoundry/bosh-agent/v2/platform/net" "github.com/cloudfoundry/bosh-utils/logger/loggerfakes" fakesys "github.com/cloudfoundry/bosh-utils/system/fakes" ) diff --git a/platform/net/routes_searcher_windows_test.go b/platform/net/routes_searcher_windows_test.go index d9e0611ee..0012d19d6 100644 --- a/platform/net/routes_searcher_windows_test.go +++ b/platform/net/routes_searcher_windows_test.go @@ -1,8 +1,8 @@ package net_test import ( - "github.com/cloudfoundry/bosh-agent/platform/net" - fakenet "github.com/cloudfoundry/bosh-agent/platform/net/fakes" + "github.com/cloudfoundry/bosh-agent/v2/platform/net" + fakenet "github.com/cloudfoundry/bosh-agent/v2/platform/net/fakes" fakelogger "github.com/cloudfoundry/bosh-utils/logger/loggerfakes" fakesys "github.com/cloudfoundry/bosh-utils/system/fakes" diff --git a/platform/net/ubuntu_net_manager.go b/platform/net/ubuntu_net_manager.go index 958cc2d59..1ba41bd80 100644 --- a/platform/net/ubuntu_net_manager.go +++ b/platform/net/ubuntu_net_manager.go @@ -11,16 +11,16 @@ import ( "text/template" "time" - bosharp "github.com/cloudfoundry/bosh-agent/platform/net/arp" - boshdnsresolver "github.com/cloudfoundry/bosh-agent/platform/net/dnsresolver" - boship "github.com/cloudfoundry/bosh-agent/platform/net/ip" - boshsettings "github.com/cloudfoundry/bosh-agent/settings" + bosharp "github.com/cloudfoundry/bosh-agent/v2/platform/net/arp" + boshdnsresolver "github.com/cloudfoundry/bosh-agent/v2/platform/net/dnsresolver" + boship "github.com/cloudfoundry/bosh-agent/v2/platform/net/ip" + boshsettings "github.com/cloudfoundry/bosh-agent/v2/settings" bosherr "github.com/cloudfoundry/bosh-utils/errors" boshlog "github.com/cloudfoundry/bosh-utils/logger" boshretry "github.com/cloudfoundry/bosh-utils/retrystrategy" boshsys "github.com/cloudfoundry/bosh-utils/system" - ini "github.com/cloudfoundry/bosh-agent/ini" + ini "github.com/cloudfoundry/bosh-agent/v2/ini" ) const ( diff --git a/platform/net/ubuntu_net_manager_ipv6_test.go b/platform/net/ubuntu_net_manager_ipv6_test.go index f42688b15..5d68ccfa9 100644 --- a/platform/net/ubuntu_net_manager_ipv6_test.go +++ b/platform/net/ubuntu_net_manager_ipv6_test.go @@ -9,14 +9,14 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/cloudfoundry/bosh-agent/platform/net" - fakearp "github.com/cloudfoundry/bosh-agent/platform/net/arp/fakes" - fakednsresolver "github.com/cloudfoundry/bosh-agent/platform/net/dnsresolver/fakes" - fakenet "github.com/cloudfoundry/bosh-agent/platform/net/fakes" - boship "github.com/cloudfoundry/bosh-agent/platform/net/ip" - fakeip "github.com/cloudfoundry/bosh-agent/platform/net/ip/fakes" - "github.com/cloudfoundry/bosh-agent/platform/net/netfakes" - boshsettings "github.com/cloudfoundry/bosh-agent/settings" + . "github.com/cloudfoundry/bosh-agent/v2/platform/net" + fakearp "github.com/cloudfoundry/bosh-agent/v2/platform/net/arp/fakes" + fakednsresolver "github.com/cloudfoundry/bosh-agent/v2/platform/net/dnsresolver/fakes" + fakenet "github.com/cloudfoundry/bosh-agent/v2/platform/net/fakes" + boship "github.com/cloudfoundry/bosh-agent/v2/platform/net/ip" + fakeip "github.com/cloudfoundry/bosh-agent/v2/platform/net/ip/fakes" + "github.com/cloudfoundry/bosh-agent/v2/platform/net/netfakes" + boshsettings "github.com/cloudfoundry/bosh-agent/v2/settings" boshlog "github.com/cloudfoundry/bosh-utils/logger" fakesys "github.com/cloudfoundry/bosh-utils/system/fakes" ) diff --git a/platform/net/ubuntu_net_manager_test.go b/platform/net/ubuntu_net_manager_test.go index 633d1d38f..67e003d56 100644 --- a/platform/net/ubuntu_net_manager_test.go +++ b/platform/net/ubuntu_net_manager_test.go @@ -11,15 +11,15 @@ import ( . "github.com/onsi/gomega" "github.com/onsi/gomega/format" - "github.com/cloudfoundry/bosh-agent/factory" - . "github.com/cloudfoundry/bosh-agent/platform/net" - fakearp "github.com/cloudfoundry/bosh-agent/platform/net/arp/fakes" - fakednsresolver "github.com/cloudfoundry/bosh-agent/platform/net/dnsresolver/fakes" - fakenet "github.com/cloudfoundry/bosh-agent/platform/net/fakes" - boship "github.com/cloudfoundry/bosh-agent/platform/net/ip" - fakeip "github.com/cloudfoundry/bosh-agent/platform/net/ip/fakes" - "github.com/cloudfoundry/bosh-agent/platform/net/netfakes" - boshsettings "github.com/cloudfoundry/bosh-agent/settings" + "github.com/cloudfoundry/bosh-agent/v2/factory" + . "github.com/cloudfoundry/bosh-agent/v2/platform/net" + fakearp "github.com/cloudfoundry/bosh-agent/v2/platform/net/arp/fakes" + fakednsresolver "github.com/cloudfoundry/bosh-agent/v2/platform/net/dnsresolver/fakes" + fakenet "github.com/cloudfoundry/bosh-agent/v2/platform/net/fakes" + boship "github.com/cloudfoundry/bosh-agent/v2/platform/net/ip" + fakeip "github.com/cloudfoundry/bosh-agent/v2/platform/net/ip/fakes" + "github.com/cloudfoundry/bosh-agent/v2/platform/net/netfakes" + boshsettings "github.com/cloudfoundry/bosh-agent/v2/settings" boshlog "github.com/cloudfoundry/bosh-utils/logger" fakesys "github.com/cloudfoundry/bosh-utils/system/fakes" ) diff --git a/platform/net/windows_net_manager.go b/platform/net/windows_net_manager.go index f5849b2fa..d1edfbad8 100644 --- a/platform/net/windows_net_manager.go +++ b/platform/net/windows_net_manager.go @@ -8,8 +8,8 @@ import ( "code.cloudfoundry.org/clock" - boshsettings "github.com/cloudfoundry/bosh-agent/settings" - boshdirs "github.com/cloudfoundry/bosh-agent/settings/directories" + boshsettings "github.com/cloudfoundry/bosh-agent/v2/settings" + boshdirs "github.com/cloudfoundry/bosh-agent/v2/settings/directories" bosherr "github.com/cloudfoundry/bosh-utils/errors" boshlog "github.com/cloudfoundry/bosh-utils/logger" boshsys "github.com/cloudfoundry/bosh-utils/system" diff --git a/platform/net/windows_net_manager_test.go b/platform/net/windows_net_manager_test.go index 63a1f3fea..c36e9cd1b 100644 --- a/platform/net/windows_net_manager_test.go +++ b/platform/net/windows_net_manager_test.go @@ -13,14 +13,14 @@ import ( "code.cloudfoundry.org/clock/fakeclock" - boshsettings "github.com/cloudfoundry/bosh-agent/settings" - boshdirs "github.com/cloudfoundry/bosh-agent/settings/directories" + boshsettings "github.com/cloudfoundry/bosh-agent/v2/settings" + boshdirs "github.com/cloudfoundry/bosh-agent/v2/settings/directories" boshlog "github.com/cloudfoundry/bosh-utils/logger" boshsys "github.com/cloudfoundry/bosh-utils/system" fakesys "github.com/cloudfoundry/bosh-utils/system/fakes" - . "github.com/cloudfoundry/bosh-agent/platform/net" - "github.com/cloudfoundry/bosh-agent/platform/net/netfakes" + . "github.com/cloudfoundry/bosh-agent/v2/platform/net" + "github.com/cloudfoundry/bosh-agent/v2/platform/net/netfakes" ) var _ = Describe("WindowsNetManager", func() { diff --git a/platform/openiscsi/concrete_open_iscsi_admin_test.go b/platform/openiscsi/concrete_open_iscsi_admin_test.go index 47cd537f9..9720a536a 100644 --- a/platform/openiscsi/concrete_open_iscsi_admin_test.go +++ b/platform/openiscsi/concrete_open_iscsi_admin_test.go @@ -6,7 +6,7 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/cloudfoundry/bosh-agent/platform/openiscsi" + . "github.com/cloudfoundry/bosh-agent/v2/platform/openiscsi" boshlog "github.com/cloudfoundry/bosh-utils/logger" fakesys "github.com/cloudfoundry/bosh-utils/system/fakes" ) diff --git a/platform/openiscsi/openiscsifakes/fake_open_iscsi.go b/platform/openiscsi/openiscsifakes/fake_open_iscsi.go index 801677eb1..25f9ff5eb 100644 --- a/platform/openiscsi/openiscsifakes/fake_open_iscsi.go +++ b/platform/openiscsi/openiscsifakes/fake_open_iscsi.go @@ -4,7 +4,7 @@ package openiscsifakes import ( "sync" - "github.com/cloudfoundry/bosh-agent/platform/openiscsi" + "github.com/cloudfoundry/bosh-agent/v2/platform/openiscsi" ) type FakeOpenIscsi struct { diff --git a/platform/platform_interface.go b/platform/platform_interface.go index e279f6f81..d5912af38 100644 --- a/platform/platform_interface.go +++ b/platform/platform_interface.go @@ -3,14 +3,14 @@ package platform import ( "log" - "github.com/cloudfoundry/bosh-agent/platform/cert" - - boshlogstarprovider "github.com/cloudfoundry/bosh-agent/agent/logstarprovider" - boshdpresolv "github.com/cloudfoundry/bosh-agent/infrastructure/devicepathresolver" - boshvitals "github.com/cloudfoundry/bosh-agent/platform/vitals" - "github.com/cloudfoundry/bosh-agent/servicemanager" - boshsettings "github.com/cloudfoundry/bosh-agent/settings" - boshdir "github.com/cloudfoundry/bosh-agent/settings/directories" + "github.com/cloudfoundry/bosh-agent/v2/platform/cert" + + boshlogstarprovider "github.com/cloudfoundry/bosh-agent/v2/agent/logstarprovider" + boshdpresolv "github.com/cloudfoundry/bosh-agent/v2/infrastructure/devicepathresolver" + boshvitals "github.com/cloudfoundry/bosh-agent/v2/platform/vitals" + "github.com/cloudfoundry/bosh-agent/v2/servicemanager" + boshsettings "github.com/cloudfoundry/bosh-agent/v2/settings" + boshdir "github.com/cloudfoundry/bosh-agent/v2/settings/directories" boshcmd "github.com/cloudfoundry/bosh-utils/fileutil" boshsys "github.com/cloudfoundry/bosh-utils/system" ) diff --git a/platform/platformfakes/fake_audit_logger.go b/platform/platformfakes/fake_audit_logger.go index 6a742e67f..f0aba6a63 100644 --- a/platform/platformfakes/fake_audit_logger.go +++ b/platform/platformfakes/fake_audit_logger.go @@ -4,7 +4,7 @@ package platformfakes import ( "sync" - "github.com/cloudfoundry/bosh-agent/platform" + "github.com/cloudfoundry/bosh-agent/v2/platform" ) type FakeAuditLogger struct { diff --git a/platform/platformfakes/fake_platform.go b/platform/platformfakes/fake_platform.go index 29a412269..ba8c3d650 100644 --- a/platform/platformfakes/fake_platform.go +++ b/platform/platformfakes/fake_platform.go @@ -4,15 +4,15 @@ package platformfakes import ( "sync" - "github.com/cloudfoundry/bosh-agent/agent/logstarprovider" - "github.com/cloudfoundry/bosh-agent/infrastructure/devicepathresolver" - "github.com/cloudfoundry/bosh-agent/platform" - "github.com/cloudfoundry/bosh-agent/platform/cert" - "github.com/cloudfoundry/bosh-agent/platform/vitals" - "github.com/cloudfoundry/bosh-agent/servicemanager" - "github.com/cloudfoundry/bosh-agent/servicemanager/servicemanagerfakes" - "github.com/cloudfoundry/bosh-agent/settings" - "github.com/cloudfoundry/bosh-agent/settings/directories" + "github.com/cloudfoundry/bosh-agent/v2/agent/logstarprovider" + "github.com/cloudfoundry/bosh-agent/v2/infrastructure/devicepathresolver" + "github.com/cloudfoundry/bosh-agent/v2/platform" + "github.com/cloudfoundry/bosh-agent/v2/platform/cert" + "github.com/cloudfoundry/bosh-agent/v2/platform/vitals" + "github.com/cloudfoundry/bosh-agent/v2/servicemanager" + "github.com/cloudfoundry/bosh-agent/v2/servicemanager/servicemanagerfakes" + "github.com/cloudfoundry/bosh-agent/v2/settings" + "github.com/cloudfoundry/bosh-agent/v2/settings/directories" "github.com/cloudfoundry/bosh-utils/fileutil" "github.com/cloudfoundry/bosh-utils/system" ) diff --git a/platform/provider.go b/platform/provider.go index 941a591f0..36c08215b 100644 --- a/platform/provider.go +++ b/platform/provider.go @@ -13,22 +13,22 @@ import ( boshsys "github.com/cloudfoundry/bosh-utils/system" boshuuid "github.com/cloudfoundry/bosh-utils/uuid" - boshlogstarprovider "github.com/cloudfoundry/bosh-agent/agent/logstarprovider" - "github.com/cloudfoundry/bosh-agent/infrastructure/devicepathresolver" - boshcdrom "github.com/cloudfoundry/bosh-agent/platform/cdrom" - boshcert "github.com/cloudfoundry/bosh-agent/platform/cert" - boshdisk "github.com/cloudfoundry/bosh-agent/platform/disk" - boshnet "github.com/cloudfoundry/bosh-agent/platform/net" - bosharp "github.com/cloudfoundry/bosh-agent/platform/net/arp" - "github.com/cloudfoundry/bosh-agent/platform/net/dnsresolver" - boship "github.com/cloudfoundry/bosh-agent/platform/net/ip" - boshiscsi "github.com/cloudfoundry/bosh-agent/platform/openiscsi" - boshstats "github.com/cloudfoundry/bosh-agent/platform/stats" - boshudev "github.com/cloudfoundry/bosh-agent/platform/udevdevice" - boshvitals "github.com/cloudfoundry/bosh-agent/platform/vitals" - boshwindisk "github.com/cloudfoundry/bosh-agent/platform/windows/disk" - "github.com/cloudfoundry/bosh-agent/servicemanager" - boshdirs "github.com/cloudfoundry/bosh-agent/settings/directories" + boshlogstarprovider "github.com/cloudfoundry/bosh-agent/v2/agent/logstarprovider" + "github.com/cloudfoundry/bosh-agent/v2/infrastructure/devicepathresolver" + boshcdrom "github.com/cloudfoundry/bosh-agent/v2/platform/cdrom" + boshcert "github.com/cloudfoundry/bosh-agent/v2/platform/cert" + boshdisk "github.com/cloudfoundry/bosh-agent/v2/platform/disk" + boshnet "github.com/cloudfoundry/bosh-agent/v2/platform/net" + bosharp "github.com/cloudfoundry/bosh-agent/v2/platform/net/arp" + "github.com/cloudfoundry/bosh-agent/v2/platform/net/dnsresolver" + boship "github.com/cloudfoundry/bosh-agent/v2/platform/net/ip" + boshiscsi "github.com/cloudfoundry/bosh-agent/v2/platform/openiscsi" + boshstats "github.com/cloudfoundry/bosh-agent/v2/platform/stats" + boshudev "github.com/cloudfoundry/bosh-agent/v2/platform/udevdevice" + boshvitals "github.com/cloudfoundry/bosh-agent/v2/platform/vitals" + boshwindisk "github.com/cloudfoundry/bosh-agent/v2/platform/windows/disk" + "github.com/cloudfoundry/bosh-agent/v2/servicemanager" + boshdirs "github.com/cloudfoundry/bosh-agent/v2/settings/directories" ) const ( diff --git a/platform/stats/fakes/fake_stats_collector.go b/platform/stats/fakes/fake_stats_collector.go index e4944da4d..b8932e7eb 100644 --- a/platform/stats/fakes/fake_stats_collector.go +++ b/platform/stats/fakes/fake_stats_collector.go @@ -4,7 +4,7 @@ import ( "errors" "time" - boshstats "github.com/cloudfoundry/bosh-agent/platform/stats" + boshstats "github.com/cloudfoundry/bosh-agent/v2/platform/stats" ) type FakeCollector struct { diff --git a/platform/stats/percentage_test.go b/platform/stats/percentage_test.go index 6d92ef2cd..b49899724 100644 --- a/platform/stats/percentage_test.go +++ b/platform/stats/percentage_test.go @@ -4,7 +4,7 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/cloudfoundry/bosh-agent/platform/stats" + . "github.com/cloudfoundry/bosh-agent/v2/platform/stats" ) func init() { // nolint:gochecknoinits diff --git a/platform/stats/stats_collector_interface_test.go b/platform/stats/stats_collector_interface_test.go index 013c0a2d5..8918ca642 100644 --- a/platform/stats/stats_collector_interface_test.go +++ b/platform/stats/stats_collector_interface_test.go @@ -4,7 +4,7 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/cloudfoundry/bosh-agent/platform/stats" + . "github.com/cloudfoundry/bosh-agent/v2/platform/stats" ) var _ = Describe("CPUStats", func() { diff --git a/platform/syscall_windows.go b/platform/syscall_windows.go index c8ca95288..3150da675 100644 --- a/platform/syscall_windows.go +++ b/platform/syscall_windows.go @@ -15,7 +15,7 @@ import ( "syscall" "unsafe" - "github.com/cloudfoundry/bosh-agent/jobsupervisor/winsvc" + "github.com/cloudfoundry/bosh-agent/v2/jobsupervisor/winsvc" "golang.org/x/sys/windows" "golang.org/x/sys/windows/registry" diff --git a/platform/udevdevice/concrete_udev_device_test.go b/platform/udevdevice/concrete_udev_device_test.go index 7f43a97fe..43b5dac22 100644 --- a/platform/udevdevice/concrete_udev_device_test.go +++ b/platform/udevdevice/concrete_udev_device_test.go @@ -1,7 +1,7 @@ package udevdevice_test import ( - . "github.com/cloudfoundry/bosh-agent/platform/udevdevice" + . "github.com/cloudfoundry/bosh-agent/v2/platform/udevdevice" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/platform/vitals/service.go b/platform/vitals/service.go index dd243af9d..26e769466 100644 --- a/platform/vitals/service.go +++ b/platform/vitals/service.go @@ -5,9 +5,9 @@ import ( sigar "github.com/cloudfoundry/gosigar" - boshdisk "github.com/cloudfoundry/bosh-agent/platform/disk" - boshstats "github.com/cloudfoundry/bosh-agent/platform/stats" - boshdirs "github.com/cloudfoundry/bosh-agent/settings/directories" + boshdisk "github.com/cloudfoundry/bosh-agent/v2/platform/disk" + boshstats "github.com/cloudfoundry/bosh-agent/v2/platform/stats" + boshdirs "github.com/cloudfoundry/bosh-agent/v2/settings/directories" bosherr "github.com/cloudfoundry/bosh-utils/errors" ) diff --git a/platform/vitals/service_test.go b/platform/vitals/service_test.go index 65d5c570c..0e60fc9e7 100644 --- a/platform/vitals/service_test.go +++ b/platform/vitals/service_test.go @@ -8,11 +8,11 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/cloudfoundry/bosh-agent/platform/disk/diskfakes" - boshstats "github.com/cloudfoundry/bosh-agent/platform/stats" - fakestats "github.com/cloudfoundry/bosh-agent/platform/stats/fakes" - . "github.com/cloudfoundry/bosh-agent/platform/vitals" - boshdirs "github.com/cloudfoundry/bosh-agent/settings/directories" + "github.com/cloudfoundry/bosh-agent/v2/platform/disk/diskfakes" + boshstats "github.com/cloudfoundry/bosh-agent/v2/platform/stats" + fakestats "github.com/cloudfoundry/bosh-agent/v2/platform/stats/fakes" + . "github.com/cloudfoundry/bosh-agent/v2/platform/vitals" + boshdirs "github.com/cloudfoundry/bosh-agent/v2/settings/directories" boshassert "github.com/cloudfoundry/bosh-utils/assert" ) diff --git a/platform/vitals/service_unix.go b/platform/vitals/service_unix.go index ffb24eb11..d111e4b8b 100644 --- a/platform/vitals/service_unix.go +++ b/platform/vitals/service_unix.go @@ -6,7 +6,7 @@ package vitals import ( "fmt" - boshstats "github.com/cloudfoundry/bosh-agent/platform/stats" + boshstats "github.com/cloudfoundry/bosh-agent/v2/platform/stats" ) func createLoadVitals(loadStats boshstats.CPULoad) []string { diff --git a/platform/vitals/service_windows.go b/platform/vitals/service_windows.go index f1d7ec40c..191f37bee 100644 --- a/platform/vitals/service_windows.go +++ b/platform/vitals/service_windows.go @@ -1,6 +1,6 @@ package vitals -import boshstats "github.com/cloudfoundry/bosh-agent/platform/stats" +import boshstats "github.com/cloudfoundry/bosh-agent/v2/platform/stats" func createLoadVitals(loadStats boshstats.CPULoad) []string { return []string{""} diff --git a/platform/vitals/vitalsfakes/fake_service.go b/platform/vitals/vitalsfakes/fake_service.go index 4e488303f..22efe2253 100644 --- a/platform/vitals/vitalsfakes/fake_service.go +++ b/platform/vitals/vitalsfakes/fake_service.go @@ -4,7 +4,7 @@ package vitalsfakes import ( "sync" - "github.com/cloudfoundry/bosh-agent/platform/vitals" + "github.com/cloudfoundry/bosh-agent/v2/platform/vitals" ) type FakeService struct { diff --git a/platform/windows/disk/fakes/fake_windows_disk_formatter.go b/platform/windows/disk/fakes/fake_windows_disk_formatter.go index cc948f312..40a4fe154 100644 --- a/platform/windows/disk/fakes/fake_windows_disk_formatter.go +++ b/platform/windows/disk/fakes/fake_windows_disk_formatter.go @@ -4,7 +4,7 @@ package fakes import ( "sync" - "github.com/cloudfoundry/bosh-agent/platform/windows/disk" + "github.com/cloudfoundry/bosh-agent/v2/platform/windows/disk" ) type FakeWindowsDiskFormatter struct { diff --git a/platform/windows/disk/fakes/fake_windows_disk_linker.go b/platform/windows/disk/fakes/fake_windows_disk_linker.go index 854952459..bbce54c98 100644 --- a/platform/windows/disk/fakes/fake_windows_disk_linker.go +++ b/platform/windows/disk/fakes/fake_windows_disk_linker.go @@ -4,7 +4,7 @@ package fakes import ( "sync" - "github.com/cloudfoundry/bosh-agent/platform/windows/disk" + "github.com/cloudfoundry/bosh-agent/v2/platform/windows/disk" ) type FakeWindowsDiskLinker struct { diff --git a/platform/windows/disk/fakes/fake_windows_disk_partitioner.go b/platform/windows/disk/fakes/fake_windows_disk_partitioner.go index b35f5daf7..ce995e338 100644 --- a/platform/windows/disk/fakes/fake_windows_disk_partitioner.go +++ b/platform/windows/disk/fakes/fake_windows_disk_partitioner.go @@ -4,7 +4,7 @@ package fakes import ( "sync" - "github.com/cloudfoundry/bosh-agent/platform/windows/disk" + "github.com/cloudfoundry/bosh-agent/v2/platform/windows/disk" ) type FakeWindowsDiskPartitioner struct { diff --git a/platform/windows/disk/fakes/fake_windows_disk_protector.go b/platform/windows/disk/fakes/fake_windows_disk_protector.go index 2e786b0bf..803872010 100644 --- a/platform/windows/disk/fakes/fake_windows_disk_protector.go +++ b/platform/windows/disk/fakes/fake_windows_disk_protector.go @@ -4,7 +4,7 @@ package fakes import ( "sync" - "github.com/cloudfoundry/bosh-agent/platform/windows/disk" + "github.com/cloudfoundry/bosh-agent/v2/platform/windows/disk" ) type FakeWindowsDiskProtector struct { diff --git a/platform/windows/disk/formatter_test.go b/platform/windows/disk/formatter_test.go index 544a08630..e15002e57 100644 --- a/platform/windows/disk/formatter_test.go +++ b/platform/windows/disk/formatter_test.go @@ -6,7 +6,7 @@ import ( "strings" - "github.com/cloudfoundry/bosh-agent/platform/windows/disk" + "github.com/cloudfoundry/bosh-agent/v2/platform/windows/disk" "github.com/cloudfoundry/bosh-utils/system/fakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/platform/windows/disk/linker_test.go b/platform/windows/disk/linker_test.go index e38692dda..e3ebc4ee5 100755 --- a/platform/windows/disk/linker_test.go +++ b/platform/windows/disk/linker_test.go @@ -6,7 +6,7 @@ import ( "strings" - "github.com/cloudfoundry/bosh-agent/platform/windows/disk" + "github.com/cloudfoundry/bosh-agent/v2/platform/windows/disk" "github.com/cloudfoundry/bosh-utils/system/fakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/platform/windows/disk/manager.go b/platform/windows/disk/manager.go index c4b6c8f96..a3582dca5 100644 --- a/platform/windows/disk/manager.go +++ b/platform/windows/disk/manager.go @@ -1,7 +1,7 @@ package disk import ( - "github.com/cloudfoundry/bosh-agent/platform/windows/powershell" + "github.com/cloudfoundry/bosh-agent/v2/platform/windows/powershell" "github.com/cloudfoundry/bosh-utils/system" ) diff --git a/platform/windows/disk/manager_test.go b/platform/windows/disk/manager_test.go index b91c3ec85..912609eb1 100644 --- a/platform/windows/disk/manager_test.go +++ b/platform/windows/disk/manager_test.go @@ -1,8 +1,8 @@ package disk_test import ( - "github.com/cloudfoundry/bosh-agent/platform/windows/disk" - "github.com/cloudfoundry/bosh-agent/platform/windows/powershell" + "github.com/cloudfoundry/bosh-agent/v2/platform/windows/disk" + "github.com/cloudfoundry/bosh-agent/v2/platform/windows/powershell" "github.com/cloudfoundry/bosh-utils/system" "github.com/cloudfoundry/bosh-utils/system/fakes" . "github.com/onsi/ginkgo/v2" diff --git a/platform/windows/disk/partitioner_test.go b/platform/windows/disk/partitioner_test.go index d23fa7c15..df64dce1a 100644 --- a/platform/windows/disk/partitioner_test.go +++ b/platform/windows/disk/partitioner_test.go @@ -6,7 +6,7 @@ import ( "strings" - "github.com/cloudfoundry/bosh-agent/platform/windows/disk" + "github.com/cloudfoundry/bosh-agent/v2/platform/windows/disk" "github.com/cloudfoundry/bosh-utils/system/fakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/platform/windows/disk/protector_test.go b/platform/windows/disk/protector_test.go index eba40ffdd..6f692b023 100755 --- a/platform/windows/disk/protector_test.go +++ b/platform/windows/disk/protector_test.go @@ -6,7 +6,7 @@ import ( "strings" - "github.com/cloudfoundry/bosh-agent/platform/windows/disk" + "github.com/cloudfoundry/bosh-agent/v2/platform/windows/disk" "github.com/cloudfoundry/bosh-utils/system/fakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/platform/windows/powershell/runner_test.go b/platform/windows/powershell/runner_test.go index 4879cdc73..39e309894 100644 --- a/platform/windows/powershell/runner_test.go +++ b/platform/windows/powershell/runner_test.go @@ -9,7 +9,7 @@ import ( "os" "os/exec" - "github.com/cloudfoundry/bosh-agent/platform/windows/powershell" + "github.com/cloudfoundry/bosh-agent/v2/platform/windows/powershell" "github.com/cloudfoundry/bosh-utils/system" "github.com/cloudfoundry/bosh-utils/system/fakes" . "github.com/onsi/ginkgo/v2" diff --git a/platform/windows_platform.go b/platform/windows_platform.go index f96aca38c..2696cd81f 100644 --- a/platform/windows_platform.go +++ b/platform/windows_platform.go @@ -17,16 +17,16 @@ import ( boshsys "github.com/cloudfoundry/bosh-utils/system" boshuuid "github.com/cloudfoundry/bosh-utils/uuid" - boshlogstarprovider "github.com/cloudfoundry/bosh-agent/agent/logstarprovider" - boshdpresolv "github.com/cloudfoundry/bosh-agent/infrastructure/devicepathresolver" - boshcert "github.com/cloudfoundry/bosh-agent/platform/cert" - boshnet "github.com/cloudfoundry/bosh-agent/platform/net" - boshstats "github.com/cloudfoundry/bosh-agent/platform/stats" - boshvitals "github.com/cloudfoundry/bosh-agent/platform/vitals" - "github.com/cloudfoundry/bosh-agent/platform/windows/disk" - "github.com/cloudfoundry/bosh-agent/servicemanager" - boshsettings "github.com/cloudfoundry/bosh-agent/settings" - boshdirs "github.com/cloudfoundry/bosh-agent/settings/directories" + boshlogstarprovider "github.com/cloudfoundry/bosh-agent/v2/agent/logstarprovider" + boshdpresolv "github.com/cloudfoundry/bosh-agent/v2/infrastructure/devicepathresolver" + boshcert "github.com/cloudfoundry/bosh-agent/v2/platform/cert" + boshnet "github.com/cloudfoundry/bosh-agent/v2/platform/net" + boshstats "github.com/cloudfoundry/bosh-agent/v2/platform/stats" + boshvitals "github.com/cloudfoundry/bosh-agent/v2/platform/vitals" + "github.com/cloudfoundry/bosh-agent/v2/platform/windows/disk" + "github.com/cloudfoundry/bosh-agent/v2/servicemanager" + boshsettings "github.com/cloudfoundry/bosh-agent/v2/settings" + boshdirs "github.com/cloudfoundry/bosh-agent/v2/settings/directories" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 -o fakes/fake_windows_disk_manager.go . WindowsDiskManager diff --git a/platform/windows_platform_test.go b/platform/windows_platform_test.go index 2d90d7792..3f7b8df15 100644 --- a/platform/windows_platform_test.go +++ b/platform/windows_platform_test.go @@ -16,13 +16,13 @@ import ( "github.com/google/uuid" - fakelogstarprovider "github.com/cloudfoundry/bosh-agent/agent/logstarprovider/logstarproviderfakes" - "github.com/cloudfoundry/bosh-agent/platform/windows/powershell" + fakelogstarprovider "github.com/cloudfoundry/bosh-agent/v2/agent/logstarprovider/logstarproviderfakes" + "github.com/cloudfoundry/bosh-agent/v2/platform/windows/powershell" "golang.org/x/sys/windows" "golang.org/x/sys/windows/svc/mgr" - . "github.com/cloudfoundry/bosh-agent/platform" + . "github.com/cloudfoundry/bosh-agent/v2/platform" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" @@ -33,15 +33,15 @@ import ( fakeuuidgen "github.com/cloudfoundry/bosh-utils/uuid/fakes" "github.com/onsi/gomega/gbytes" - fakedpresolv "github.com/cloudfoundry/bosh-agent/infrastructure/devicepathresolver/fakes" - "github.com/cloudfoundry/bosh-agent/platform/cert/certfakes" - fakeplat "github.com/cloudfoundry/bosh-agent/platform/fakes" - fakenet "github.com/cloudfoundry/bosh-agent/platform/net/fakes" - fakestats "github.com/cloudfoundry/bosh-agent/platform/stats/fakes" - "github.com/cloudfoundry/bosh-agent/platform/windows/disk" - fakedisk "github.com/cloudfoundry/bosh-agent/platform/windows/disk/fakes" - boshsettings "github.com/cloudfoundry/bosh-agent/settings" - boshdirs "github.com/cloudfoundry/bosh-agent/settings/directories" + fakedpresolv "github.com/cloudfoundry/bosh-agent/v2/infrastructure/devicepathresolver/fakes" + "github.com/cloudfoundry/bosh-agent/v2/platform/cert/certfakes" + fakeplat "github.com/cloudfoundry/bosh-agent/v2/platform/fakes" + fakenet "github.com/cloudfoundry/bosh-agent/v2/platform/net/fakes" + fakestats "github.com/cloudfoundry/bosh-agent/v2/platform/stats/fakes" + "github.com/cloudfoundry/bosh-agent/v2/platform/windows/disk" + fakedisk "github.com/cloudfoundry/bosh-agent/v2/platform/windows/disk/fakes" + boshsettings "github.com/cloudfoundry/bosh-agent/v2/settings" + boshdirs "github.com/cloudfoundry/bosh-agent/v2/settings/directories" ) var ( diff --git a/releasetarball/compile.go b/releasetarball/compile.go index 5491a2e2f..dcfb8a30c 100644 --- a/releasetarball/compile.go +++ b/releasetarball/compile.go @@ -39,14 +39,14 @@ import ( boshlog "github.com/cloudfoundry/bosh-utils/logger" boshsys "github.com/cloudfoundry/bosh-utils/system" - boshmodels "github.com/cloudfoundry/bosh-agent/agent/applier/models" - boshap "github.com/cloudfoundry/bosh-agent/agent/applier/packages" - boshagentblobstore "github.com/cloudfoundry/bosh-agent/agent/blobstore" - boshrunner "github.com/cloudfoundry/bosh-agent/agent/cmdrunner" - boshcomp "github.com/cloudfoundry/bosh-agent/agent/compiler" - "github.com/cloudfoundry/bosh-agent/agent/httpblobprovider" - "github.com/cloudfoundry/bosh-agent/agent/httpblobprovider/blobstore_delegator" - "github.com/cloudfoundry/bosh-agent/settings/directories" + boshmodels "github.com/cloudfoundry/bosh-agent/v2/agent/applier/models" + boshap "github.com/cloudfoundry/bosh-agent/v2/agent/applier/packages" + boshagentblobstore "github.com/cloudfoundry/bosh-agent/v2/agent/blobstore" + boshrunner "github.com/cloudfoundry/bosh-agent/v2/agent/cmdrunner" + boshcomp "github.com/cloudfoundry/bosh-agent/v2/agent/compiler" + "github.com/cloudfoundry/bosh-agent/v2/agent/httpblobprovider" + "github.com/cloudfoundry/bosh-agent/v2/agent/httpblobprovider/blobstore_delegator" + "github.com/cloudfoundry/bosh-agent/v2/settings/directories" ) const ( diff --git a/releasetarball/compile_test.go b/releasetarball/compile_test.go index d9044e760..0ed8825eb 100644 --- a/releasetarball/compile_test.go +++ b/releasetarball/compile_test.go @@ -23,11 +23,11 @@ import ( boshcrypto "github.com/cloudfoundry/bosh-utils/crypto" "gopkg.in/yaml.v3" - "github.com/cloudfoundry/bosh-agent/agent/applier/models" - "github.com/cloudfoundry/bosh-agent/agent/compiler" - "github.com/cloudfoundry/bosh-agent/releasetarball" - "github.com/cloudfoundry/bosh-agent/releasetarball/internal/fakes" - "github.com/cloudfoundry/bosh-agent/settings/directories" + "github.com/cloudfoundry/bosh-agent/v2/agent/applier/models" + "github.com/cloudfoundry/bosh-agent/v2/agent/compiler" + "github.com/cloudfoundry/bosh-agent/v2/releasetarball" + "github.com/cloudfoundry/bosh-agent/v2/releasetarball/internal/fakes" + "github.com/cloudfoundry/bosh-agent/v2/settings/directories" ) func TestSuite(t *testing.T) { @@ -63,7 +63,7 @@ var _ = Describe("NewCompiler", func() { }) }) -//go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 -fake-name Compiler -o internal/fakes/compiler.go github.com/cloudfoundry/bosh-agent/agent/compiler.Compiler +//go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 -fake-name Compiler -o internal/fakes/compiler.go github.com/cloudfoundry/bosh-agent/v2/agent/compiler.Compiler var _ = Describe("Compile", func() { const stemcellSlug = "banana-slug/1.23" diff --git a/releasetarball/internal/fakes/compiler.go b/releasetarball/internal/fakes/compiler.go index 93e35a35f..f1e00dc08 100644 --- a/releasetarball/internal/fakes/compiler.go +++ b/releasetarball/internal/fakes/compiler.go @@ -4,8 +4,8 @@ package fakes import ( "sync" - "github.com/cloudfoundry/bosh-agent/agent/applier/models" - "github.com/cloudfoundry/bosh-agent/agent/compiler" + "github.com/cloudfoundry/bosh-agent/v2/agent/applier/models" + "github.com/cloudfoundry/bosh-agent/v2/agent/compiler" "github.com/cloudfoundry/bosh-utils/crypto" ) diff --git a/servicemanager/servicemanagerfakes/fake_service_manager.go b/servicemanager/servicemanagerfakes/fake_service_manager.go index 10ef1f87d..b7e6b1458 100644 --- a/servicemanager/servicemanagerfakes/fake_service_manager.go +++ b/servicemanager/servicemanagerfakes/fake_service_manager.go @@ -4,7 +4,7 @@ package servicemanagerfakes import ( "sync" - "github.com/cloudfoundry/bosh-agent/servicemanager" + "github.com/cloudfoundry/bosh-agent/v2/servicemanager" ) type FakeServiceManager struct { diff --git a/servicemanager/sv_service_manager_test.go b/servicemanager/sv_service_manager_test.go index 04771ea28..aa7824f99 100644 --- a/servicemanager/sv_service_manager_test.go +++ b/servicemanager/sv_service_manager_test.go @@ -7,7 +7,7 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/cloudfoundry/bosh-agent/servicemanager" + "github.com/cloudfoundry/bosh-agent/v2/servicemanager" ) var _ = Describe("svServiceManager", func() { diff --git a/settings/directories/directories_provider_test.go b/settings/directories/directories_provider_test.go index 9cd499beb..da3e6d15f 100644 --- a/settings/directories/directories_provider_test.go +++ b/settings/directories/directories_provider_test.go @@ -3,7 +3,7 @@ package directories_test import ( "path/filepath" - "github.com/cloudfoundry/bosh-agent/settings/directories" + "github.com/cloudfoundry/bosh-agent/v2/settings/directories" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/settings/fakes/fake_settings_service.go b/settings/fakes/fake_settings_service.go index b920d0ff7..262eaa14f 100644 --- a/settings/fakes/fake_settings_service.go +++ b/settings/fakes/fake_settings_service.go @@ -1,7 +1,7 @@ package fakes import ( - boshsettings "github.com/cloudfoundry/bosh-agent/settings" + boshsettings "github.com/cloudfoundry/bosh-agent/v2/settings" ) type FakeSettingsService struct { diff --git a/settings/service_test.go b/settings/service_test.go index 8ae8c76d8..f99121da0 100644 --- a/settings/service_test.go +++ b/settings/service_test.go @@ -7,9 +7,9 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/cloudfoundry/bosh-agent/infrastructure/fakes" - . "github.com/cloudfoundry/bosh-agent/settings" - "github.com/cloudfoundry/bosh-agent/settings/settingsfakes" + "github.com/cloudfoundry/bosh-agent/v2/infrastructure/fakes" + . "github.com/cloudfoundry/bosh-agent/v2/settings" + "github.com/cloudfoundry/bosh-agent/v2/settings/settingsfakes" boshlog "github.com/cloudfoundry/bosh-utils/logger" fakesys "github.com/cloudfoundry/bosh-utils/system/fakes" ) diff --git a/settings/settings.go b/settings/settings.go index 23337dbed..129d4dedd 100644 --- a/settings/settings.go +++ b/settings/settings.go @@ -5,7 +5,7 @@ import ( "net" "strconv" - "github.com/cloudfoundry/bosh-agent/platform/disk" + "github.com/cloudfoundry/bosh-agent/v2/platform/disk" ) type DiskAssociations []DiskAssociation diff --git a/settings/settings_test.go b/settings/settings_test.go index 7ba51786f..6647d0df0 100644 --- a/settings/settings_test.go +++ b/settings/settings_test.go @@ -6,9 +6,9 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/cloudfoundry/bosh-agent/matchers" - "github.com/cloudfoundry/bosh-agent/platform/disk" - . "github.com/cloudfoundry/bosh-agent/settings" + . "github.com/cloudfoundry/bosh-agent/v2/matchers" + "github.com/cloudfoundry/bosh-agent/v2/platform/disk" + . "github.com/cloudfoundry/bosh-agent/v2/settings" ) var _ = Describe("Settings", func() { diff --git a/settings/settingsfakes/fake_platform_settings_getter.go b/settings/settingsfakes/fake_platform_settings_getter.go index 950b66a19..58a895f4e 100644 --- a/settings/settingsfakes/fake_platform_settings_getter.go +++ b/settings/settingsfakes/fake_platform_settings_getter.go @@ -4,7 +4,7 @@ package settingsfakes import ( "sync" - "github.com/cloudfoundry/bosh-agent/settings" + "github.com/cloudfoundry/bosh-agent/v2/settings" ) type FakePlatformSettingsGetter struct { diff --git a/settings/update_settings_test.go b/settings/update_settings_test.go index 2eb21e903..b8ad5cd31 100644 --- a/settings/update_settings_test.go +++ b/settings/update_settings_test.go @@ -1,7 +1,7 @@ package settings_test import ( - . "github.com/cloudfoundry/bosh-agent/settings" + . "github.com/cloudfoundry/bosh-agent/v2/settings" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/sigar/sigar_stats_collector.go b/sigar/sigar_stats_collector.go index df506b06c..c5efedd34 100644 --- a/sigar/sigar_stats_collector.go +++ b/sigar/sigar_stats_collector.go @@ -6,7 +6,7 @@ import ( sigar "github.com/cloudfoundry/gosigar" - boshstats "github.com/cloudfoundry/bosh-agent/platform/stats" + boshstats "github.com/cloudfoundry/bosh-agent/v2/platform/stats" bosherr "github.com/cloudfoundry/bosh-utils/errors" ) diff --git a/sigar/sigar_stats_collector_test.go b/sigar/sigar_stats_collector_test.go index b8cbbd740..b3343984c 100644 --- a/sigar/sigar_stats_collector_test.go +++ b/sigar/sigar_stats_collector_test.go @@ -6,8 +6,8 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/cloudfoundry/bosh-agent/platform/stats" - boshsigar "github.com/cloudfoundry/bosh-agent/sigar" + . "github.com/cloudfoundry/bosh-agent/v2/platform/stats" + boshsigar "github.com/cloudfoundry/bosh-agent/v2/sigar" sigar "github.com/cloudfoundry/gosigar" fakesigar "github.com/cloudfoundry/gosigar/fakes" )