revert hydraboker dependency to the old one

cloudfoundry · Oct 18, 2024 · 43cc5b2 · 43cc5b2
1 parent b065e2c
commit 43cc5b2
Show file tree

Hide file tree

Showing 20 changed files with 33 additions and 35 deletions.
diff --git a/integration/assets/hydrabroker/app/app.go b/integration/assets/hydrabroker/app/app.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"net/http"
 
-	"code.cloudfoundry.org/cli/v8/integration/assets/hydrabroker/store"
+	"code.cloudfoundry.org/cli/integration/assets/hydrabroker/store"
 	"github.com/gorilla/mux"
 )
 

diff --git a/integration/assets/hydrabroker/app/broker.go b/integration/assets/hydrabroker/app/broker.go
@@ -8,9 +8,9 @@ import (
 	"net/http"
 	"time"
 
-	"code.cloudfoundry.org/cli/v8/integration/assets/hydrabroker/config"
-	"code.cloudfoundry.org/cli/v8/integration/assets/hydrabroker/resources"
-	"code.cloudfoundry.org/cli/v8/integration/assets/hydrabroker/store"
+	"code.cloudfoundry.org/cli/integration/assets/hydrabroker/config"
+	"code.cloudfoundry.org/cli/integration/assets/hydrabroker/resources"
+	"code.cloudfoundry.org/cli/integration/assets/hydrabroker/store"
 	"github.com/pivotal-cf/brokerapi/v7/domain"
 	"github.com/pivotal-cf/brokerapi/v7/domain/apiresponses"
 )

diff --git a/integration/assets/hydrabroker/app/config.go b/integration/assets/hydrabroker/app/config.go
@@ -5,8 +5,8 @@ import (
 	"io"
 	"net/http"
 
-	"code.cloudfoundry.org/cli/v8/integration/assets/hydrabroker/config"
-	"code.cloudfoundry.org/cli/v8/integration/assets/hydrabroker/store"
+	"code.cloudfoundry.org/cli/integration/assets/hydrabroker/config"
+	"code.cloudfoundry.org/cli/integration/assets/hydrabroker/store"
 	"github.com/go-playground/validator/v10"
 )
 

diff --git a/integration/assets/hydrabroker/app/helpers.go b/integration/assets/hydrabroker/app/helpers.go
@@ -6,7 +6,7 @@ import (
 	"log"
 	"net/http"
 
-	"code.cloudfoundry.org/cli/v8/integration/assets/hydrabroker/store"
+	"code.cloudfoundry.org/cli/integration/assets/hydrabroker/store"
 	"github.com/gorilla/mux"
 	uuid "github.com/nu7hatch/gouuid"
 )

diff --git a/integration/assets/hydrabroker/database/database_test.go b/integration/assets/hydrabroker/database/database_test.go
@@ -4,7 +4,6 @@ import (
 	"fmt"
 	"sync"
 
-	. "code.cloudfoundry.org/cli/v8/integration/assets/hydrabroker/database"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )

diff --git a/integration/assets/hydrabroker/go.mod b/integration/assets/hydrabroker/go.mod
@@ -1,4 +1,4 @@
-module code.cloudfoundry.org/cli/v8/integration/assets/hydrabroker
+module code.cloudfoundry.org/cli/integration/assets/hydrabroker
 
 go 1.13
 

diff --git a/integration/assets/hydrabroker/integrationtest/integrationtest_test.go b/integration/assets/hydrabroker/integrationtest/integrationtest_test.go
@@ -11,9 +11,9 @@ import (
 	"strings"
 	"time"
 
-	"code.cloudfoundry.org/cli/v8/integration/assets/hydrabroker/app"
-	"code.cloudfoundry.org/cli/v8/integration/assets/hydrabroker/config"
-	"code.cloudfoundry.org/cli/v8/integration/assets/hydrabroker/resources"
+	"code.cloudfoundry.org/cli/integration/assets/hydrabroker/app"
+	"code.cloudfoundry.org/cli/integration/assets/hydrabroker/config"
+	"code.cloudfoundry.org/cli/integration/assets/hydrabroker/resources"
 	uuid2 "github.com/nu7hatch/gouuid"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"

diff --git a/integration/assets/hydrabroker/main.go b/integration/assets/hydrabroker/main.go
@@ -6,7 +6,7 @@ import (
 	"net/http"
 	"os"
 
-	"code.cloudfoundry.org/cli/v8/integration/assets/hydrabroker/app"
+	"code.cloudfoundry.org/cli/integration/assets/hydrabroker/app"
 )
 
 func main() {

diff --git a/integration/assets/hydrabroker/store/bindings.go b/integration/assets/hydrabroker/store/bindings.go
@@ -3,8 +3,8 @@ package store
 import (
 	"fmt"
 
-	"code.cloudfoundry.org/cli/v8/integration/assets/hydrabroker/database"
-	"code.cloudfoundry.org/cli/v8/integration/assets/hydrabroker/resources"
+	"code.cloudfoundry.org/cli/integration/assets/hydrabroker/database"
+	"code.cloudfoundry.org/cli/integration/assets/hydrabroker/resources"
 )
 
 func (st *Store) CreateBinding(brokerID BrokerID, instanceID InstanceID, bindingID BindingID, details resources.BindingDetails) error {

diff --git a/integration/assets/hydrabroker/store/bindings_test.go b/integration/assets/hydrabroker/store/bindings_test.go
@@ -3,9 +3,9 @@ package store_test
 import (
 	"fmt"
 
-	"code.cloudfoundry.org/cli/v8/integration/assets/hydrabroker/config"
-	"code.cloudfoundry.org/cli/v8/integration/assets/hydrabroker/resources"
-	"code.cloudfoundry.org/cli/v8/integration/assets/hydrabroker/store"
+	"code.cloudfoundry.org/cli/integration/assets/hydrabroker/config"
+	"code.cloudfoundry.org/cli/integration/assets/hydrabroker/resources"
+	"code.cloudfoundry.org/cli/integration/assets/hydrabroker/store"
 	uuid "github.com/nu7hatch/gouuid"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"

diff --git a/integration/assets/hydrabroker/store/brokers.go b/integration/assets/hydrabroker/store/brokers.go
@@ -1,8 +1,8 @@
 package store
 
 import (
-	"code.cloudfoundry.org/cli/v8/integration/assets/hydrabroker/config"
-	"code.cloudfoundry.org/cli/v8/integration/assets/hydrabroker/database"
+	"code.cloudfoundry.org/cli/integration/assets/hydrabroker/config"
+	"code.cloudfoundry.org/cli/integration/assets/hydrabroker/database"
 )
 
 func (st *Store) CreateBroker(cfg config.BrokerConfiguration) BrokerID {

diff --git a/integration/assets/hydrabroker/store/brokers_test.go b/integration/assets/hydrabroker/store/brokers_test.go
@@ -1,11 +1,11 @@
 package store_test
 
 import (
-	"code.cloudfoundry.org/cli/v8/integration/assets/hydrabroker/config"
+	"code.cloudfoundry.org/cli/integration/assets/hydrabroker/config"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 
-	"code.cloudfoundry.org/cli/v8/integration/assets/hydrabroker/store"
+	"code.cloudfoundry.org/cli/integration/assets/hydrabroker/store"
 )
 
 var _ = Describe("Brokers", func() {

diff --git a/integration/assets/hydrabroker/store/instances.go b/integration/assets/hydrabroker/store/instances.go
@@ -3,9 +3,9 @@ package store
 import (
 	"fmt"
 
-	"code.cloudfoundry.org/cli/v8/integration/assets/hydrabroker/config"
-	"code.cloudfoundry.org/cli/v8/integration/assets/hydrabroker/database"
-	"code.cloudfoundry.org/cli/v8/integration/assets/hydrabroker/resources"
+	"code.cloudfoundry.org/cli/integration/assets/hydrabroker/config"
+	"code.cloudfoundry.org/cli/integration/assets/hydrabroker/database"
+	"code.cloudfoundry.org/cli/integration/assets/hydrabroker/resources"
 )
 
 func (st *Store) CreateInstance(brokerID BrokerID, instanceID InstanceID, details resources.ServiceInstanceDetails) error {

diff --git a/integration/assets/hydrabroker/store/instances_test.go b/integration/assets/hydrabroker/store/instances_test.go
@@ -3,14 +3,13 @@ package store_test
 import (
 	"fmt"
 
-	"code.cloudfoundry.org/cli/v8/integration/assets/hydrabroker/config"
-	"code.cloudfoundry.org/cli/v8/integration/assets/hydrabroker/resources"
+	"code.cloudfoundry.org/cli/integration/assets/hydrabroker/config"
+	"code.cloudfoundry.org/cli/integration/assets/hydrabroker/resources"
 	uuid "github.com/nu7hatch/gouuid"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 
-	"code.cloudfoundry.org/cli/v8/integration/assets/hydrabroker/store"
-	uuid "github.com/nu7hatch/gouuid"
+	"code.cloudfoundry.org/cli/integration/assets/hydrabroker/store"
 )
 
 var _ = Describe("Instances", func() {

diff --git a/integration/assets/hydrabroker/store/store.go b/integration/assets/hydrabroker/store/store.go
@@ -1,7 +1,7 @@
 package store
 
 import (
-	"code.cloudfoundry.org/cli/v8/integration/assets/hydrabroker/database"
+	"code.cloudfoundry.org/cli/integration/assets/hydrabroker/database"
 )
 
 type BrokerID database.ID

diff --git a/integration/helpers/servicebrokerstub/api.go b/integration/helpers/servicebrokerstub/api.go
@@ -5,7 +5,7 @@ import (
 
 	"code.cloudfoundry.org/cli/v8/integration/helpers"
 
-	"code.cloudfoundry.org/cli/v8/integration/assets/hydrabroker/config"
+	"code.cloudfoundry.org/cli/integration/assets/hydrabroker/config"
 )
 
 type ServiceAccessConfig struct {

diff --git a/integration/helpers/servicebrokerstub/app_config.go b/integration/helpers/servicebrokerstub/app_config.go
@@ -7,7 +7,7 @@ import (
 	"io"
 	"net/http"
 
-	"code.cloudfoundry.org/cli/v8/integration/assets/hydrabroker/config"
+	"code.cloudfoundry.org/cli/integration/assets/hydrabroker/config"
 	"code.cloudfoundry.org/cli/v8/integration/helpers"
 	. "github.com/onsi/gomega"
 )

diff --git a/integration/v7/isolated/marketplace_command_test.go b/integration/v7/isolated/marketplace_command_test.go
@@ -3,7 +3,7 @@ package isolated
 import (
 	"fmt"
 
-	"code.cloudfoundry.org/cli/v8/integration/assets/hydrabroker/config"
+	"code.cloudfoundry.org/cli/integration/assets/hydrabroker/config"
 	"code.cloudfoundry.org/cli/v8/integration/helpers"
 	"code.cloudfoundry.org/cli/v8/integration/helpers/servicebrokerstub"
 	. "github.com/onsi/ginkgo/v2"

diff --git a/integration/v7/isolated/services_command_test.go b/integration/v7/isolated/services_command_test.go
@@ -1,7 +1,7 @@
 package isolated
 
 import (
-	"code.cloudfoundry.org/cli/v8/integration/assets/hydrabroker/config"
+	"code.cloudfoundry.org/cli/integration/assets/hydrabroker/config"
 	"code.cloudfoundry.org/cli/v8/integration/helpers"
 	"code.cloudfoundry.org/cli/v8/integration/helpers/servicebrokerstub"
 	. "github.com/onsi/ginkgo/v2"

diff --git a/integration/v7/isolated/upgrade_service_command_test.go b/integration/v7/isolated/upgrade_service_command_test.go
@@ -3,7 +3,7 @@ package isolated
 import (
 	"time"
 
-	"code.cloudfoundry.org/cli/v8/integration/assets/hydrabroker/config"
+	"code.cloudfoundry.org/cli/integration/assets/hydrabroker/config"
 	"code.cloudfoundry.org/cli/v8/integration/helpers"
 	"code.cloudfoundry.org/cli/v8/integration/helpers/servicebrokerstub"
 	. "github.com/onsi/ginkgo/v2"