Merge pull request #678 from cloudfoundry/bosh-agent-go-mod-v2

Use bosh-agent v2 Go module
cloudfoundry · Dec 17, 2024 · 350fe96 · 350fe96
2 parents 87c3681 + 7733d67
commit 350fe96
Show file tree

Hide file tree

Showing 60 changed files with 338 additions and 331 deletions.
diff --git a/agentclient/mocks/mocks.go b/agentclient/mocks/mocks.go
diff --git a/cmd/cmd.go b/cmd/cmd.go
@@ -5,7 +5,7 @@ import (
 	"path/filepath"
 	"time"
 
-	bihttpagent "github.com/cloudfoundry/bosh-agent/agentclient/http"
+	bihttpagent "github.com/cloudfoundry/bosh-agent/v2/agentclient/http"
 	"github.com/cppforlife/go-patch/patch"
 
 	cmdconf "github.com/cloudfoundry/bosh-cli/v7/cmd/config"

diff --git a/cmd/create_env_test.go b/cmd/create_env_test.go
@@ -7,7 +7,7 @@ import (
 	"path/filepath"
 	"regexp"
 
-	mockhttpagent "github.com/cloudfoundry/bosh-agent/agentclient/http/mocks"
+	mockhttpagent "github.com/cloudfoundry/bosh-agent/v2/agentclient/http/mocks"
 	bosherr "github.com/cloudfoundry/bosh-utils/errors"
 	boshlog "github.com/cloudfoundry/bosh-utils/logger"
 	biproperty "github.com/cloudfoundry/bosh-utils/property"

diff --git a/cmd/deployment_deleter.go b/cmd/deployment_deleter.go
@@ -1,7 +1,7 @@
 package cmd
 
 import (
-	bihttpagent "github.com/cloudfoundry/bosh-agent/agentclient/http"
+	bihttpagent "github.com/cloudfoundry/bosh-agent/v2/agentclient/http"
 	bosherr "github.com/cloudfoundry/bosh-utils/errors"
 	bihttpclient "github.com/cloudfoundry/bosh-utils/httpclient"
 	boshlog "github.com/cloudfoundry/bosh-utils/logger"
@@ -197,7 +197,7 @@ func (c *deploymentDeleter) findCurrentDeploymentAndDelete(skipDrain bool, stage
 
 	return stage.PerformComplex("deleting deployment", func(deleteStage biui.Stage) error {
 		if !found {
-			//TODO: skip? would require adding skip support to PerformComplex
+			// TODO: skip? would require adding skip support to PerformComplex
 			c.logger.Debug(c.logTag, "No current deployment found...")
 			return nil
 		}

diff --git a/cmd/deployment_deleter_test.go b/cmd/deployment_deleter_test.go
@@ -5,7 +5,7 @@ import (
 	"os"
 	"path/filepath"
 
-	mockhttpagent "github.com/cloudfoundry/bosh-agent/agentclient/http/mocks"
+	mockhttpagent "github.com/cloudfoundry/bosh-agent/v2/agentclient/http/mocks"
 	bosherr "github.com/cloudfoundry/bosh-utils/errors"
 	boshlog "github.com/cloudfoundry/bosh-utils/logger"
 	biproperty "github.com/cloudfoundry/bosh-utils/property"

diff --git a/cmd/deployment_preparer.go b/cmd/deployment_preparer.go
@@ -1,7 +1,7 @@
 package cmd
 
 import (
-	bihttpagent "github.com/cloudfoundry/bosh-agent/agentclient/http"
+	bihttpagent "github.com/cloudfoundry/bosh-agent/v2/agentclient/http"
 	bosherr "github.com/cloudfoundry/bosh-utils/errors"
 	bihttpclient "github.com/cloudfoundry/bosh-utils/httpclient"
 	boshlog "github.com/cloudfoundry/bosh-utils/logger"

diff --git a/cmd/deployment_state_manager.go b/cmd/deployment_state_manager.go
@@ -1,7 +1,7 @@
 package cmd
 
 import (
-	bihttpagent "github.com/cloudfoundry/bosh-agent/agentclient/http"
+	bihttpagent "github.com/cloudfoundry/bosh-agent/v2/agentclient/http"
 	bosherr "github.com/cloudfoundry/bosh-utils/errors"
 	boshlog "github.com/cloudfoundry/bosh-utils/logger"
 	"github.com/cppforlife/go-patch/patch"

diff --git a/cmd/deployment_state_manager_test.go b/cmd/deployment_state_manager_test.go
@@ -3,7 +3,7 @@ package cmd_test
 import (
 	"path/filepath"
 
-	mockhttpagent "github.com/cloudfoundry/bosh-agent/agentclient/http/mocks"
+	mockhttpagent "github.com/cloudfoundry/bosh-agent/v2/agentclient/http/mocks"
 	boshlog "github.com/cloudfoundry/bosh-utils/logger"
 	fakesys "github.com/cloudfoundry/bosh-utils/system/fakes"
 	fakeuuid "github.com/cloudfoundry/bosh-utils/uuid/fakes"

diff --git a/cmd/env_factory.go b/cmd/env_factory.go
@@ -5,7 +5,7 @@ import (
 	"path/filepath"
 	"time"
 
-	bihttpagent "github.com/cloudfoundry/bosh-agent/agentclient/http"
+	bihttpagent "github.com/cloudfoundry/bosh-agent/v2/agentclient/http"
 	"github.com/cloudfoundry/bosh-utils/httpclient"
 	"github.com/cppforlife/go-patch/patch"
 

diff --git a/cmd/logs.go b/cmd/logs.go
@@ -9,8 +9,8 @@ import (
 
 	"code.cloudfoundry.org/clock"
 
-	biagentclient "github.com/cloudfoundry/bosh-agent/agentclient"
-	bihttpagent "github.com/cloudfoundry/bosh-agent/agentclient/http"
+	biagentclient "github.com/cloudfoundry/bosh-agent/v2/agentclient"
+	bihttpagent "github.com/cloudfoundry/bosh-agent/v2/agentclient/http"
 	boshcrypto "github.com/cloudfoundry/bosh-utils/crypto"
 	bosherr "github.com/cloudfoundry/bosh-utils/errors"
 	boshfu "github.com/cloudfoundry/bosh-utils/fileutil"

diff --git a/cmd/logs_test.go b/cmd/logs_test.go
@@ -8,8 +8,8 @@ import (
 
 	"code.cloudfoundry.org/clock"
 	"code.cloudfoundry.org/clock/fakeclock"
-	"github.com/cloudfoundry/bosh-agent/agentclient"
-	mockhttpagent "github.com/cloudfoundry/bosh-agent/agentclient/http/mocks"
+	"github.com/cloudfoundry/bosh-agent/v2/agentclient"
+	mockhttpagent "github.com/cloudfoundry/bosh-agent/v2/agentclient/http/mocks"
 	boshsys "github.com/cloudfoundry/bosh-utils/system"
 	"github.com/cloudfoundry/bosh-utils/system/fakes"
 	fakeuuid "github.com/cloudfoundry/bosh-utils/uuid/fakes"

diff --git a/cmd/scp.go b/cmd/scp.go
@@ -3,7 +3,7 @@ package cmd
 import (
 	"errors"
 
-	bihttpagent "github.com/cloudfoundry/bosh-agent/agentclient/http"
+	bihttpagent "github.com/cloudfoundry/bosh-agent/v2/agentclient/http"
 	bosherr "github.com/cloudfoundry/bosh-utils/errors"
 
 	boshdir "github.com/cloudfoundry/bosh-cli/v7/director"

diff --git a/cmd/scp_test.go b/cmd/scp_test.go
@@ -3,8 +3,8 @@ package cmd_test
 import (
 	"errors"
 
-	"github.com/cloudfoundry/bosh-agent/agentclient"
-	mockhttpagent "github.com/cloudfoundry/bosh-agent/agentclient/http/mocks"
+	"github.com/cloudfoundry/bosh-agent/v2/agentclient"
+	mockhttpagent "github.com/cloudfoundry/bosh-agent/v2/agentclient/http/mocks"
 	fakeuuid "github.com/cloudfoundry/bosh-utils/uuid/fakes"
 	"github.com/golang/mock/gomock"
 	. "github.com/onsi/ginkgo/v2"

diff --git a/cmd/ssh.go b/cmd/ssh.go
@@ -3,7 +3,7 @@ package cmd
 import (
 	"errors"
 
-	bihttpagent "github.com/cloudfoundry/bosh-agent/agentclient/http"
+	bihttpagent "github.com/cloudfoundry/bosh-agent/v2/agentclient/http"
 	bosherr "github.com/cloudfoundry/bosh-utils/errors"
 
 	boshdir "github.com/cloudfoundry/bosh-cli/v7/director"

diff --git a/cmd/ssh_test.go b/cmd/ssh_test.go
@@ -3,8 +3,8 @@ package cmd_test
 import (
 	"errors"
 
-	"github.com/cloudfoundry/bosh-agent/agentclient"
-	mockhttpagent "github.com/cloudfoundry/bosh-agent/agentclient/http/mocks"
+	"github.com/cloudfoundry/bosh-agent/v2/agentclient"
+	mockhttpagent "github.com/cloudfoundry/bosh-agent/v2/agentclient/http/mocks"
 	fakeuuid "github.com/cloudfoundry/bosh-utils/uuid/fakes"
 	"github.com/golang/mock/gomock"
 	. "github.com/onsi/ginkgo/v2"

diff --git a/deployment/deployer_test.go b/deployment/deployer_test.go
@@ -3,9 +3,9 @@ package deployment_test
 import (
 	"time"
 
-	"github.com/cloudfoundry/bosh-agent/agentclient"
-	bias "github.com/cloudfoundry/bosh-agent/agentclient/applyspec"
-	mock_httpagent "github.com/cloudfoundry/bosh-agent/agentclient/http/mocks"
+	"github.com/cloudfoundry/bosh-agent/v2/agentclient"
+	bias "github.com/cloudfoundry/bosh-agent/v2/agentclient/applyspec"
+	mock_httpagent "github.com/cloudfoundry/bosh-agent/v2/agentclient/http/mocks"
 	bosherr "github.com/cloudfoundry/bosh-utils/errors"
 	boshlog "github.com/cloudfoundry/bosh-utils/logger"
 	biproperty "github.com/cloudfoundry/bosh-utils/property"

diff --git a/deployment/deployment_test.go b/deployment/deployment_test.go
@@ -3,8 +3,8 @@ package deployment_test
 import (
 	"time"
 
-	biagentclient "github.com/cloudfoundry/bosh-agent/agentclient"
-	bias "github.com/cloudfoundry/bosh-agent/agentclient/applyspec"
+	biagentclient "github.com/cloudfoundry/bosh-agent/v2/agentclient"
+	bias "github.com/cloudfoundry/bosh-agent/v2/agentclient/applyspec"
 	bosherr "github.com/cloudfoundry/bosh-utils/errors"
 	boshlog "github.com/cloudfoundry/bosh-utils/logger"
 	boshsys "github.com/cloudfoundry/bosh-utils/system"
@@ -140,7 +140,7 @@ var _ = Describe("Deployment", func() {
 		var err error
 		deployment, _, err = deploymentManager.FindCurrent()
 		Expect(err).ToNot(HaveOccurred())
-		//Note: deployment will be nil if the config has no vms, disks, or stemcells
+		// Note: deployment will be nil if the config has no vms, disks, or stemcells
 	})
 
 	AfterEach(func() {
@@ -267,7 +267,7 @@ var _ = Describe("Deployment", func() {
 				Expect(stemcellRecords).To(BeEmpty(), "expected no stemcell records")
 			})
 
-			//TODO: It'd be nice to test recovering after agent was responsive, before timeout (hard to do with gomock)
+			// TODO: It'd be nice to test recovering after agent was responsive, before timeout (hard to do with gomock)
 			Context("when agent is unresponsive", func() {
 				BeforeEach(func() {
 					// reduce timout & delay to reduce test duration

diff --git a/deployment/instance/instance_test.go b/deployment/instance/instance_test.go
@@ -3,8 +3,8 @@ package instance_test
 import (
 	"time"
 
-	"github.com/cloudfoundry/bosh-agent/agentclient"
-	bias "github.com/cloudfoundry/bosh-agent/agentclient/applyspec"
+	"github.com/cloudfoundry/bosh-agent/v2/agentclient"
+	bias "github.com/cloudfoundry/bosh-agent/v2/agentclient/applyspec"
 	bosherr "github.com/cloudfoundry/bosh-utils/errors"
 	"github.com/cloudfoundry/bosh-utils/logger/loggerfakes"
 	"github.com/golang/mock/gomock"

diff --git a/deployment/instance/manager_test.go b/deployment/instance/manager_test.go
@@ -4,8 +4,8 @@ import (
 	"errors"
 	"time"
 
-	"github.com/cloudfoundry/bosh-agent/agentclient"
-	bias "github.com/cloudfoundry/bosh-agent/agentclient/applyspec"
+	"github.com/cloudfoundry/bosh-agent/v2/agentclient"
+	bias "github.com/cloudfoundry/bosh-agent/v2/agentclient/applyspec"
 	boshlog "github.com/cloudfoundry/bosh-utils/logger"
 	biproperty "github.com/cloudfoundry/bosh-utils/property"
 	"github.com/golang/mock/gomock"

diff --git a/deployment/instance/state/builder.go b/deployment/instance/state/builder.go
@@ -3,7 +3,7 @@ package state
 import (
 	"errors"
 
-	"github.com/cloudfoundry/bosh-agent/agentclient"
+	"github.com/cloudfoundry/bosh-agent/v2/agentclient"
 	bosherr "github.com/cloudfoundry/bosh-utils/errors"
 	boshlog "github.com/cloudfoundry/bosh-utils/logger"
 	biproperty "github.com/cloudfoundry/bosh-utils/property"

diff --git a/deployment/instance/state/builder_factory.go b/deployment/instance/state/builder_factory.go
@@ -1,7 +1,7 @@
 package state
 
 import (
-	biagentclient "github.com/cloudfoundry/bosh-agent/agentclient"
+	biagentclient "github.com/cloudfoundry/bosh-agent/v2/agentclient"
 	boshlog "github.com/cloudfoundry/bosh-utils/logger"
 
 	biblobstore "github.com/cloudfoundry/bosh-cli/v7/blobstore"

diff --git a/deployment/instance/state/builder_test.go b/deployment/instance/state/builder_test.go
@@ -1,8 +1,8 @@
 package state_test
 
 import (
-	biac "github.com/cloudfoundry/bosh-agent/agentclient"
-	bias "github.com/cloudfoundry/bosh-agent/agentclient/applyspec"
+	biac "github.com/cloudfoundry/bosh-agent/v2/agentclient"
+	bias "github.com/cloudfoundry/bosh-agent/v2/agentclient/applyspec"
 	boshlog "github.com/cloudfoundry/bosh-utils/logger"
 	biproperty "github.com/cloudfoundry/bosh-utils/property"
 	"github.com/golang/mock/gomock"
@@ -101,7 +101,7 @@ var _ = Describe("Builder", func() {
 					},
 				},
 				Properties: biproperty.Map{
-					"fake-job-property": "fake-global-property-value", //overridden by job property value
+					"fake-job-property": "fake-global-property-value", // overridden by job property value
 				},
 			}
 
@@ -207,7 +207,7 @@ var _ = Describe("Builder", func() {
 					},
 				},
 				Properties: biproperty.Map{
-					"fake-job-property": "fake-global-property-value", //overridden by job property value
+					"fake-job-property": "fake-global-property-value", // overridden by job property value
 				},
 			}
 

diff --git a/deployment/instance/state/mocks/mocks.go b/deployment/instance/state/mocks/mocks.go
diff --git a/deployment/instance/state/remote_package_compiler.go b/deployment/instance/state/remote_package_compiler.go
@@ -1,7 +1,7 @@
 package state
 
 import (
-	biagentclient "github.com/cloudfoundry/bosh-agent/agentclient"
+	biagentclient "github.com/cloudfoundry/bosh-agent/v2/agentclient"
 	bosherr "github.com/cloudfoundry/bosh-utils/errors"
 
 	biblobstore "github.com/cloudfoundry/bosh-cli/v7/blobstore"

diff --git a/deployment/instance/state/remote_package_compiler_test.go b/deployment/instance/state/remote_package_compiler_test.go
@@ -1,7 +1,7 @@
 package state_test
 
 import (
-	biagentclient "github.com/cloudfoundry/bosh-agent/agentclient"
+	biagentclient "github.com/cloudfoundry/bosh-agent/v2/agentclient"
 	"github.com/golang/mock/gomock"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"

diff --git a/deployment/instance/state/state.go b/deployment/instance/state/state.go
@@ -3,7 +3,7 @@ package state
 import (
 	"strconv"
 
-	bias "github.com/cloudfoundry/bosh-agent/agentclient/applyspec"
+	bias "github.com/cloudfoundry/bosh-agent/v2/agentclient/applyspec"
 )
 
 type State interface {

diff --git a/deployment/instance/state/state_test.go b/deployment/instance/state/state_test.go
@@ -3,7 +3,7 @@ package state_test
 import (
 	. "github.com/cloudfoundry/bosh-cli/v7/deployment/instance/state"
 
-	bias "github.com/cloudfoundry/bosh-agent/agentclient/applyspec"
+	bias "github.com/cloudfoundry/bosh-agent/v2/agentclient/applyspec"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )

diff --git a/deployment/manager_factory.go b/deployment/manager_factory.go
@@ -1,7 +1,7 @@
 package deployment
 
 import (
-	biagentclient "github.com/cloudfoundry/bosh-agent/agentclient"
+	biagentclient "github.com/cloudfoundry/bosh-agent/v2/agentclient"
 
 	biblobstore "github.com/cloudfoundry/bosh-cli/v7/blobstore"
 	bicloud "github.com/cloudfoundry/bosh-cli/v7/cloud"

diff --git a/deployment/mocks/mocks.go b/deployment/mocks/mocks.go
diff --git a/deployment/vm/fakes/fake_vm.go b/deployment/vm/fakes/fake_vm.go
@@ -3,8 +3,8 @@ package fakes
 import (
 	"time"
 
-	biagentclient "github.com/cloudfoundry/bosh-agent/agentclient"
-	bias "github.com/cloudfoundry/bosh-agent/agentclient/applyspec"
+	biagentclient "github.com/cloudfoundry/bosh-agent/v2/agentclient"
+	bias "github.com/cloudfoundry/bosh-agent/v2/agentclient/applyspec"
 
 	bidisk "github.com/cloudfoundry/bosh-cli/v7/deployment/disk"
 	bideplmanifest "github.com/cloudfoundry/bosh-cli/v7/deployment/manifest"

diff --git a/deployment/vm/manager.go b/deployment/vm/manager.go
@@ -5,7 +5,7 @@ import (
 	"time"
 
 	"code.cloudfoundry.org/clock"
-	biagentclient "github.com/cloudfoundry/bosh-agent/agentclient"
+	biagentclient "github.com/cloudfoundry/bosh-agent/v2/agentclient"
 	bosherr "github.com/cloudfoundry/bosh-utils/errors"
 	boshlog "github.com/cloudfoundry/bosh-utils/logger"
 	biproperty "github.com/cloudfoundry/bosh-utils/property"
@@ -136,7 +136,7 @@ func (m *manager) Create(stemcell bistemcell.CloudStemcell, deploymentManifest b
 	if err != nil {
 		cloudErr, ok := err.(bicloud.Error)
 		if ok && cloudErr.Type() == bicloud.NotImplementedError {
-			//ignore it
+			// ignore it
 		} else {
 			return nil, bosherr.WrapErrorf(err, "Setting VM metadata to %s", metadata)
 		}

diff --git a/deployment/vm/manager_factory.go b/deployment/vm/manager_factory.go
@@ -2,7 +2,7 @@ package vm
 
 import (
 	"code.cloudfoundry.org/clock"
-	biagentclient "github.com/cloudfoundry/bosh-agent/agentclient"
+	biagentclient "github.com/cloudfoundry/bosh-agent/v2/agentclient"
 	boshlog "github.com/cloudfoundry/bosh-utils/logger"
 	boshsys "github.com/cloudfoundry/bosh-utils/system"
 	boshuuid "github.com/cloudfoundry/bosh-utils/uuid"

diff --git a/deployment/vm/manager_test.go b/deployment/vm/manager_test.go
@@ -5,7 +5,7 @@ import (
 	"time"
 
 	"code.cloudfoundry.org/clock"
-	fakebiagentclient "github.com/cloudfoundry/bosh-agent/agentclient/fakes"
+	fakebiagentclient "github.com/cloudfoundry/bosh-agent/v2/agentclient/fakes"
 	boshlog "github.com/cloudfoundry/bosh-utils/logger"
 	biproperty "github.com/cloudfoundry/bosh-utils/property"
 	fakesys "github.com/cloudfoundry/bosh-utils/system/fakes"

diff --git a/deployment/vm/mocks/mocks.go b/deployment/vm/mocks/mocks.go
diff --git a/deployment/vm/vm.go b/deployment/vm/vm.go
@@ -5,8 +5,8 @@ import (
 	"strings"
 	"time"
 
-	biagentclient "github.com/cloudfoundry/bosh-agent/agentclient"
-	bias "github.com/cloudfoundry/bosh-agent/agentclient/applyspec"
+	biagentclient "github.com/cloudfoundry/bosh-agent/v2/agentclient"
+	bias "github.com/cloudfoundry/bosh-agent/v2/agentclient/applyspec"
 	bosherr "github.com/cloudfoundry/bosh-utils/errors"
 	boshlog "github.com/cloudfoundry/bosh-utils/logger"
 	boshretry "github.com/cloudfoundry/bosh-utils/retrystrategy"