From c6a5af0d7922a8b89e39402eab632a2ae2e9521e Mon Sep 17 00:00:00 2001 From: Marcin Szwed Date: Tue, 12 Nov 2024 14:24:30 +0100 Subject: [PATCH] [TEST] brokerapi std lib http req mux --- cmd/broker/binding_test.go | 2 +- cmd/broker/bindings_envtest_test.go | 5 ++-- cmd/broker/broker_suite_test.go | 5 ++-- cmd/broker/deprovisioning_suite_test.go | 2 +- cmd/broker/deprovisioning_test.go | 2 +- cmd/broker/expiration_test.go | 2 +- cmd/broker/main.go | 24 ++++++++----------- cmd/broker/metrics_test.go | 2 +- cmd/broker/provisioning_test.go | 2 +- cmd/broker/suite_test.go | 2 +- cmd/broker/update_test.go | 2 +- cmd/broker/upgrade_cluster_test.go | 2 +- common/orchestration/resolver.go | 2 +- common/orchestration/resolver_test.go | 2 +- go.mod | 6 +---- go.sum | 20 ++++------------ internal/appinfo/runtime_info_test.go | 2 +- internal/archive/service_test.go | 2 +- internal/broker/bind_create.go | 4 ++-- internal/broker/bind_create_test.go | 3 +-- internal/broker/bind_delete.go | 4 ++-- internal/broker/bind_get.go | 4 ++-- internal/broker/bind_get_test.go | 4 ++-- internal/broker/bind_last_operation.go | 2 +- internal/broker/client.go | 2 +- internal/broker/instance_create.go | 4 ++-- .../instance_create_input_params_test.go | 2 +- internal/broker/instance_create_test.go | 4 ++-- internal/broker/instance_deprovision.go | 4 ++-- internal/broker/instance_deprovision_test.go | 2 +- internal/broker/instance_get.go | 4 ++-- internal/broker/instance_get_test.go | 4 ++-- internal/broker/instance_last_operation.go | 4 ++-- .../broker/instance_last_operation_test.go | 2 +- internal/broker/instance_update.go | 4 ++-- internal/broker/instance_update_test.go | 4 ++-- internal/broker/plans.go | 2 +- internal/broker/response_labels.go | 6 ++--- internal/broker/server.go | 12 +++++----- internal/broker/services.go | 2 +- internal/broker/services_test.go | 2 +- internal/expiration/handler.go | 2 +- internal/expiration/handler_test.go | 2 +- internal/fixture/fixture.go | 2 +- internal/kubeconfig/handler.go | 2 +- internal/kubeconfig/handler_test.go | 2 +- internal/metricsv2/metrics.go | 2 +- internal/metricsv2/operation_duration.go | 2 +- internal/metricsv2/operations_result.go | 2 +- internal/metricsv2/operations_result_test.go | 2 +- internal/metricsv2/operations_stats.go | 2 +- internal/metricsv2/operations_stats_test.go | 2 +- internal/model.go | 2 +- .../handlers/orchestration_handler_test.go | 2 +- internal/orchestration/manager/manager.go | 2 +- .../orchestration/manager/upgrade_cluster.go | 2 +- .../check_runtime_removal_step_test.go | 2 +- internal/process/deprovisioning/init.go | 2 +- internal/process/deprovisioning/init_test.go | 2 +- .../release_subscription_step_test.go | 2 +- internal/process/operation_manager.go | 2 +- .../provisioning/check_runtime_step_test.go | 2 +- .../create_resource_names_step_test.go | 2 +- .../create_runtime_resource_step_test.go | 2 +- .../create_runtime_without_kyma_test.go | 2 +- .../provisioning/initialisation_test.go | 2 +- ...ject_btp_operator_credentials_step_test.go | 2 +- .../provisioning/resolve_creds_test.go | 2 +- internal/process/provisioning/start_step.go | 2 +- .../process/provisioning/start_step_test.go | 2 +- internal/process/staged_manager.go | 2 +- internal/process/staged_manager_test.go | 2 +- .../process/steps/gardener_cluster_test.go | 2 +- .../process/steps/runtime_resource_test.go | 2 +- internal/process/update/check_step_test.go | 2 +- .../process/update/initialisation_step.go | 2 +- .../update/initialisation_step_test.go | 2 +- .../process/upgrade_cluster/initialisation.go | 2 +- .../upgrade_cluster/initialisation_test.go | 2 +- .../process/upgrade_cluster/manager_test.go | 2 +- internal/process/upgrade_cluster_operation.go | 2 +- .../process/upgrade_cluster_operation_test.go | 2 +- internal/runtime/converter.go | 2 +- internal/runtime/converter_test.go | 2 +- internal/runtime/handler_test.go | 2 +- .../servicebindingcleanup/service_test.go | 2 +- internal/storage/dbmodel/instance_archived.go | 2 +- internal/storage/driver/memory/instance.go | 2 +- .../driver/memory/instance_archived.go | 2 +- internal/storage/driver/memory/operation.go | 2 +- .../storage/driver/postsql/conflict_test.go | 2 +- internal/storage/driver/postsql/instance.go | 2 +- .../driver/postsql/instance_archived_test.go | 2 +- .../storage/driver/postsql/instance_test.go | 2 +- internal/storage/driver/postsql/operation.go | 2 +- .../storage/driver/postsql/operation_test.go | 2 +- internal/storage/postsql/read.go | 2 +- internal/suspension/handler.go | 4 ++-- internal/suspension/handler_test.go | 2 +- 99 files changed, 134 insertions(+), 155 deletions(-) diff --git a/cmd/broker/binding_test.go b/cmd/broker/binding_test.go index ff0b14bf4b..75bb9b0532 100644 --- a/cmd/broker/binding_test.go +++ b/cmd/broker/binding_test.go @@ -13,7 +13,7 @@ import ( "testing" "github.com/google/uuid" - "github.com/pivotal-cf/brokerapi/v8/domain" + "github.com/pivotal-cf/brokerapi/v11/domain" ) type ErrorResponse struct { diff --git a/cmd/broker/bindings_envtest_test.go b/cmd/broker/bindings_envtest_test.go index 6a08d6d294..33a2ff21fb 100644 --- a/cmd/broker/bindings_envtest_test.go +++ b/cmd/broker/bindings_envtest_test.go @@ -18,15 +18,14 @@ import ( rbacv1 "k8s.io/api/rbac/v1" apierrors "k8s.io/apimachinery/pkg/api/errors" - "code.cloudfoundry.org/lager" "github.com/gorilla/mux" "github.com/kyma-project/kyma-environment-broker/internal" "github.com/kyma-project/kyma-environment-broker/internal/broker" "github.com/kyma-project/kyma-environment-broker/internal/fixture" "github.com/kyma-project/kyma-environment-broker/internal/kubeconfig" "github.com/kyma-project/kyma-environment-broker/internal/storage" - "github.com/pivotal-cf/brokerapi/v8/domain" - "github.com/pivotal-cf/brokerapi/v8/handlers" + "github.com/pivotal-cf/brokerapi/v11/domain" + "github.com/pivotal-cf/brokerapi/v11/handlers" "github.com/sirupsen/logrus" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/cmd/broker/broker_suite_test.go b/cmd/broker/broker_suite_test.go index 4f6d38c11d..efdf15ac61 100644 --- a/cmd/broker/broker_suite_test.go +++ b/cmd/broker/broker_suite_test.go @@ -23,7 +23,6 @@ import ( "github.com/prometheus/client_golang/prometheus/promhttp" "github.com/prometheus/client_golang/prometheus/testutil" - "code.cloudfoundry.org/lager" "github.com/google/uuid" "github.com/gorilla/mux" "github.com/kyma-project/control-plane/components/provisioner/pkg/gqlschema" @@ -47,8 +46,8 @@ import ( "github.com/kyma-project/kyma-environment-broker/internal/provisioner" kebRuntime "github.com/kyma-project/kyma-environment-broker/internal/runtime" "github.com/kyma-project/kyma-environment-broker/internal/storage" - "github.com/pivotal-cf/brokerapi/v8/domain" - "github.com/pivotal-cf/brokerapi/v8/domain/apiresponses" + "github.com/pivotal-cf/brokerapi/v11/domain" + "github.com/pivotal-cf/brokerapi/v11/domain/apiresponses" "github.com/pkg/errors" "github.com/sirupsen/logrus" "github.com/stretchr/testify/assert" diff --git a/cmd/broker/deprovisioning_suite_test.go b/cmd/broker/deprovisioning_suite_test.go index 662f1faca6..132ac99d70 100644 --- a/cmd/broker/deprovisioning_suite_test.go +++ b/cmd/broker/deprovisioning_suite_test.go @@ -28,7 +28,7 @@ import ( "github.com/kyma-project/kyma-environment-broker/internal/process" "github.com/kyma-project/kyma-environment-broker/internal/provisioner" "github.com/kyma-project/kyma-environment-broker/internal/storage" - "github.com/pivotal-cf/brokerapi/v8/domain" + "github.com/pivotal-cf/brokerapi/v11/domain" "github.com/sirupsen/logrus" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/cmd/broker/deprovisioning_test.go b/cmd/broker/deprovisioning_test.go index b4bc87aa23..23cadc9284 100644 --- a/cmd/broker/deprovisioning_test.go +++ b/cmd/broker/deprovisioning_test.go @@ -12,7 +12,7 @@ import ( "github.com/google/uuid" "github.com/kyma-project/kyma-environment-broker/common/runtime" "github.com/kyma-project/kyma-environment-broker/internal" - "github.com/pivotal-cf/brokerapi/v8/domain" + "github.com/pivotal-cf/brokerapi/v11/domain" "github.com/stretchr/testify/assert" ) diff --git a/cmd/broker/expiration_test.go b/cmd/broker/expiration_test.go index 59d1bc51af..0d2ffee7d5 100644 --- a/cmd/broker/expiration_test.go +++ b/cmd/broker/expiration_test.go @@ -8,7 +8,7 @@ import ( "github.com/google/uuid" "github.com/kyma-project/kyma-environment-broker/internal" "github.com/kyma-project/kyma-environment-broker/internal/broker" - "github.com/pivotal-cf/brokerapi/v8/domain" + "github.com/pivotal-cf/brokerapi/v11/domain" "github.com/stretchr/testify/assert" ) diff --git a/cmd/broker/main.go b/cmd/broker/main.go index 8cf07b4799..05f4ac2045 100644 --- a/cmd/broker/main.go +++ b/cmd/broker/main.go @@ -4,6 +4,7 @@ import ( "context" "fmt" "io" + "log/slog" "net/http" "os" gruntime "runtime" @@ -11,7 +12,6 @@ import ( "sort" "time" - "code.cloudfoundry.org/lager" "github.com/dlmiddlecote/sqlstats" shoot "github.com/gardener/gardener/pkg/apis/core/v1beta1" "github.com/gorilla/handlers" @@ -64,6 +64,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client/config" ) +var LogLevel = new(slog.LevelVar) + // Config holds configuration for the whole application type Config struct { // DbInMemory allows to use memory storage instead of the postgres one. @@ -176,7 +178,7 @@ const ( startStageName = "start" ) -func periodicProfile(logger lager.Logger, profiler ProfilerConfig) { +func periodicProfile(logger *slog.Logger, profiler ProfilerConfig) { if profiler.Memory == false { return } @@ -228,12 +230,14 @@ func main() { if cfg.LogLevel != "" { l, _ := logrus.ParseLevel(cfg.LogLevel) logs.SetLevel(l) + if cfg.LogLevel == "debug" { + LogLevel.Set(slog.LevelDebug) + } } cfg.OrchestrationConfig.KubernetesVersion = cfg.Provisioner.KubernetesVersion // create logger - logger := lager.NewLogger("kyma-env-broker") - + logger := slog.New(slog.NewJSONHandler(os.Stdout, &slog.HandlerOptions{Level: LogLevel})).With("source", "kyma-env-broker") logger.Info("Starting Kyma Environment Broker") logger.Info("Registering healthz endpoint for health probes") @@ -283,7 +287,6 @@ func main() { fatalOnError(err, logs) dynamicGardener, err := dynamic.NewForConfig(gardenerClusterConfig) fatalOnError(err, logs) - gardenerClient, err := initClient(gardenerClusterConfig) fatalOnError(err, logs) gardenerNamespace := fmt.Sprintf("garden-%v", cfg.Gardener.Project) @@ -329,7 +332,7 @@ func main() { // create server router := mux.NewRouter() - createAPI(router, servicesConfig, inputFactory, &cfg, db, provisionQueue, deprovisionQueue, updateQueue, logger, logs, inputFactory.GetPlanDefaults, kcBuilder, skrK8sClientProvider, skrK8sClientProvider, gardenerClient, kcpK8sClient) + createAPI(router, servicesConfig, inputFactory, &cfg, db, provisionQueue, deprovisionQueue, updateQueue, logger, logs, inputFactory.GetPlanDefaults, kcBuilder, skrK8sClientProvider, skrK8sClientProvider, kcpK8sClient) // create metrics endpoint router.Handle("/metrics", promhttp.Handler()) @@ -407,19 +410,12 @@ func logConfiguration(logs *logrus.Logger, cfg Config) { logs.Infof("Is UpdateCustomResourcesLabelsOnAccountMove enabled: %t", cfg.Broker.UpdateCustomResourcesLabelsOnAccountMove) } -func createAPI(router *mux.Router, servicesConfig broker.ServicesConfig, planValidator broker.PlanValidator, cfg *Config, db storage.BrokerStorage, provisionQueue, deprovisionQueue, updateQueue *process.Queue, logger lager.Logger, logs logrus.FieldLogger, planDefaults broker.PlanDefaults, kcBuilder kubeconfig.KcBuilder, clientProvider K8sClientProvider, kubeconfigProvider KubeconfigProvider, gardenerClient, kcpK8sClient client.Client) { +func createAPI(router *mux.Router, servicesConfig broker.ServicesConfig, planValidator broker.PlanValidator, cfg *Config, db storage.BrokerStorage, provisionQueue, deprovisionQueue, updateQueue *process.Queue, logger *slog.Logger, logs logrus.FieldLogger, planDefaults broker.PlanDefaults, kcBuilder kubeconfig.KcBuilder, clientProvider K8sClientProvider, kubeconfigProvider KubeconfigProvider, kcpK8sClient client.Client) { suspensionCtxHandler := suspension.NewContextUpdateHandler(db.Operations(), provisionQueue, deprovisionQueue, logs) defaultPlansConfig, err := servicesConfig.DefaultPlansConfig() fatalOnError(err, logs) - debugSink, err := lager.NewRedactingSink(lager.NewWriterSink(os.Stdout, lager.DEBUG), []string{"instance-details"}, []string{}) - fatalOnError(err, logs) - logger.RegisterSink(debugSink) - errorSink, err := lager.NewRedactingSink(lager.NewWriterSink(os.Stderr, lager.ERROR), []string{"instance-details"}, []string{}) - fatalOnError(err, logs) - logger.RegisterSink(errorSink) - freemiumGlobalAccountIds, err := whitelist.ReadWhitelistedGlobalAccountIdsFromFile(cfg.FreemiumWhitelistedGlobalAccountsFilePath) fatalOnError(err, logs) logs.Infof("Number of globalAccountIds for unlimited freeemium: %d\n", len(freemiumGlobalAccountIds)) diff --git a/cmd/broker/metrics_test.go b/cmd/broker/metrics_test.go index 250df4f007..52ad582686 100644 --- a/cmd/broker/metrics_test.go +++ b/cmd/broker/metrics_test.go @@ -9,7 +9,7 @@ import ( "github.com/google/uuid" "github.com/kyma-project/kyma-environment-broker/internal" "github.com/kyma-project/kyma-environment-broker/internal/broker" - "github.com/pivotal-cf/brokerapi/v8/domain" + "github.com/pivotal-cf/brokerapi/v11/domain" "github.com/stretchr/testify/assert" ) diff --git a/cmd/broker/provisioning_test.go b/cmd/broker/provisioning_test.go index 1ccc9b1a8d..7a3e09ab35 100644 --- a/cmd/broker/provisioning_test.go +++ b/cmd/broker/provisioning_test.go @@ -15,7 +15,7 @@ import ( "github.com/google/uuid" "github.com/kyma-project/control-plane/components/provisioner/pkg/gqlschema" - "github.com/pivotal-cf/brokerapi/v8/domain" + "github.com/pivotal-cf/brokerapi/v11/domain" "github.com/stretchr/testify/assert" "github.com/kyma-project/kyma-environment-broker/common/hyperscaler" diff --git a/cmd/broker/suite_test.go b/cmd/broker/suite_test.go index 8aa7aaf465..5cbd1228f4 100644 --- a/cmd/broker/suite_test.go +++ b/cmd/broker/suite_test.go @@ -35,7 +35,7 @@ import ( "github.com/kyma-project/kyma-environment-broker/internal/provisioner" kebRuntime "github.com/kyma-project/kyma-environment-broker/internal/runtime" "github.com/kyma-project/kyma-environment-broker/internal/storage" - "github.com/pivotal-cf/brokerapi/v8/domain" + "github.com/pivotal-cf/brokerapi/v11/domain" "github.com/sirupsen/logrus" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" diff --git a/cmd/broker/update_test.go b/cmd/broker/update_test.go index f822baa7a6..d1e4639a18 100644 --- a/cmd/broker/update_test.go +++ b/cmd/broker/update_test.go @@ -8,7 +8,7 @@ import ( "github.com/google/uuid" "github.com/kyma-project/control-plane/components/provisioner/pkg/gqlschema" "github.com/kyma-project/kyma-environment-broker/internal" - "github.com/pivotal-cf/brokerapi/v8/domain" + "github.com/pivotal-cf/brokerapi/v11/domain" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/cmd/broker/upgrade_cluster_test.go b/cmd/broker/upgrade_cluster_test.go index 971249ad0c..ea86530a72 100644 --- a/cmd/broker/upgrade_cluster_test.go +++ b/cmd/broker/upgrade_cluster_test.go @@ -11,7 +11,7 @@ import ( "github.com/kyma-project/kyma-environment-broker/internal/ptr" "k8s.io/apimachinery/pkg/util/wait" - "github.com/pivotal-cf/brokerapi/v8/domain" + "github.com/pivotal-cf/brokerapi/v11/domain" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/common/orchestration/resolver.go b/common/orchestration/resolver.go index 72b21dc6d8..2e3b1bcb10 100644 --- a/common/orchestration/resolver.go +++ b/common/orchestration/resolver.go @@ -11,7 +11,7 @@ import ( "github.com/kyma-project/kyma-environment-broker/common/runtime" "github.com/sirupsen/logrus" - brokerapi "github.com/pivotal-cf/brokerapi/v8/domain" + brokerapi "github.com/pivotal-cf/brokerapi/v11/domain" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/client-go/dynamic" diff --git a/common/orchestration/resolver_test.go b/common/orchestration/resolver_test.go index 4c100169fc..7c9d8cc32c 100644 --- a/common/orchestration/resolver_test.go +++ b/common/orchestration/resolver_test.go @@ -11,7 +11,7 @@ import ( "github.com/stretchr/testify/assert" - brokerapi "github.com/pivotal-cf/brokerapi/v8/domain" + brokerapi "github.com/pivotal-cf/brokerapi/v11/domain" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" k8s "k8s.io/apimachinery/pkg/runtime" dynamicfake "k8s.io/client-go/dynamic/fake" diff --git a/go.mod b/go.mod index 680075dfca..332522f7bd 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,6 @@ module github.com/kyma-project/kyma-environment-broker go 1.23.1 require ( - code.cloudfoundry.org/lager v2.0.0+incompatible github.com/99designs/gqlgen v0.17.56 github.com/Azure/azure-sdk-for-go v68.0.0+incompatible github.com/Azure/go-autorest/autorest v0.11.29 @@ -27,7 +26,7 @@ require ( github.com/kyma-project/infrastructure-manager v0.0.0-20240924140719-22e21e6aa684 github.com/lib/pq v1.10.9 github.com/matryer/is v1.4.1 - github.com/pivotal-cf/brokerapi/v8 v8.2.3 + github.com/pivotal-cf/brokerapi/v11 v11.0.12-0.20241017212156-eb82c66fc625 github.com/pkg/errors v0.9.1 github.com/prometheus/client_golang v1.20.5 github.com/sebdah/goldie/v2 v2.5.5 @@ -97,7 +96,6 @@ require ( github.com/onrik/logrus v0.11.0 // indirect github.com/opencontainers/go-digest v1.0.0 // indirect github.com/opencontainers/image-spec v1.1.0 // indirect - github.com/pborman/uuid v1.2.1 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/prometheus/client_model v0.6.1 // indirect github.com/prometheus/common v0.60.1 // indirect @@ -140,8 +138,6 @@ replace ( github.com/imdario/mergo => github.com/imdario/mergo v0.3.16 - github.com/pivotal-cf/brokerapi/v8 => github.com/kyma-project/brokerapi/v8 v8.2.4-0.20241017055904-60727c4de1c4 - // include fix https://github.com/satori/go.uuid/pull/75 https://nvd.nist.gov/vuln/detail/CVE-2021-3538 github.com/satori/go.uuid => github.com/satori/go.uuid v0.0.0-20181028125025-b2ce2384e17b diff --git a/go.sum b/go.sum index 98bc6d2a46..dc9398cbe1 100644 --- a/go.sum +++ b/go.sum @@ -1,5 +1,3 @@ -code.cloudfoundry.org/lager v2.0.0+incompatible h1:WZwDKDB2PLd/oL+USK4b4aEjUymIej9My2nUQ9oWEwQ= -code.cloudfoundry.org/lager v2.0.0+incompatible/go.mod h1:O2sS7gKP3HM2iemG+EnwvyNQK7pTSC6Foi4QiMp9sSk= dario.cat/mergo v1.0.1 h1:Ra4+bf83h2ztPIQYNP99R6m+Y7KfnARDfID+a+vLl4s= dario.cat/mergo v1.0.1/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk= github.com/99designs/gqlgen v0.17.56 h1:+J42ARAHvnysH6klO9Wq+tCsGF32cpAgU3SyF0VRJtI= @@ -28,8 +26,8 @@ github.com/Azure/go-autorest/logger v0.2.1 h1:IG7i4p/mDa2Ce4TRyAO8IHnVhAVF3RFU+Z github.com/Azure/go-autorest/logger v0.2.1/go.mod h1:T9E3cAhj2VqvPOtCYAvby9aBXkZmbF5NWuPV8+WeEW8= github.com/Azure/go-autorest/tracing v0.6.0 h1:TYi4+3m5t6K48TGI9AUdb+IzbnSxvnvUMfuitfgcfuo= github.com/Azure/go-autorest/tracing v0.6.0/go.mod h1:+vhtPC754Xsa23ID7GlGsrdKBpUA79WCAKPPZVC2DeU= -github.com/BurntSushi/toml v1.4.0 h1:kuoIxZQy2WRRk1pttg9asf+WVv6tWQuBNVmK8+nqPr0= -github.com/BurntSushi/toml v1.4.0/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho= +github.com/BurntSushi/toml v1.4.1-0.20240526193622-a339e1f7089c h1:pxW6RcqyfI9/kWtOwnv/G+AzdKuy2ZrqINhenH4HyNs= +github.com/BurntSushi/toml v1.4.1-0.20240526193622-a339e1f7089c/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho= github.com/DATA-DOG/go-sqlmock v1.3.3/go.mod h1:f/Ixk793poVmq4qj/V1dPUg2JEAKC73Q5eFN3EC/SaM= github.com/DATA-DOG/go-sqlmock v1.5.0 h1:Shsta01QNfFxHCfpW6YH2STWB0MudeXXEWMr20OEh60= github.com/DATA-DOG/go-sqlmock v1.5.0/go.mod h1:f/Ixk793poVmq4qj/V1dPUg2JEAKC73Q5eFN3EC/SaM= @@ -177,7 +175,6 @@ github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0= github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/pprof v0.0.0-20241029153458-d1b30febd7db h1:097atOisP2aRj7vFgYQBbFN4U4JNXUNYpxael3UzMyo= github.com/google/pprof v0.0.0-20241029153458-d1b30febd7db/go.mod h1:vavhavw2zAxS5dIdcRluK6cSGGPlZynqzFM8NdvU144= -github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.4.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= @@ -234,8 +231,6 @@ github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0 github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw= github.com/kyma-incubator/compass/components/director v0.0.0-20240704074401-a423d6070404 h1:qQwa2HQy3vvddKutHN/fTvLkpyWo68lO2D0TgDmZkmU= github.com/kyma-incubator/compass/components/director v0.0.0-20240704074401-a423d6070404/go.mod h1:ReQk0Ajocp4iS4tby7YMFXe5khAxRYnS1SBUr8dEMkQ= -github.com/kyma-project/brokerapi/v8 v8.2.4-0.20241017055904-60727c4de1c4 h1:vXEYaBAez686+p/mrmHvJKxMZf3oXOiGyvnBtePKmNw= -github.com/kyma-project/brokerapi/v8 v8.2.4-0.20241017055904-60727c4de1c4/go.mod h1:MGZMnpFeMjZ/JVEYDv92uJMf8QMohfOFaSgPwzEQ5/c= github.com/kyma-project/control-plane/components/provisioner v0.0.0-20240925074719-868d3d02df59 h1:PAynE3RawB3Kvg9Q430hNB9FoBMViTxfy7BzC/o335U= github.com/kyma-project/control-plane/components/provisioner v0.0.0-20240925074719-868d3d02df59/go.mod h1:xgWRmQjXFgIBX+TAvHr8iQIpjFhamm4HOpHPfGmnz2Q= github.com/kyma-project/infrastructure-manager v0.0.0-20240924140719-22e21e6aa684 h1:d2IkaqzuDgE9H532UOVWlW6o3xoJsSkWBYGHudSBmv4= @@ -279,12 +274,9 @@ github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRW github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f h1:y5//uYreIhSUg3J1GEMiLbxo1LJaP8RfCpH6pymGZus= github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= -github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE= -github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU= github.com/onrik/logrus v0.11.0 h1:pu+BCaWL36t0yQaj/2UHK2erf88dwssAKOT51mxPUVs= github.com/onrik/logrus v0.11.0/go.mod h1:fO2vlZwIdti6PidD3gV5YKt9Lq5ptpnP293RAe1ITwk= -github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE= -github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU= +github.com/onsi/ginkgo v1.16.4 h1:29JGrr5oVBm5ulCWet69zQkzWipVXIol6ygQUe/EzNc= github.com/onsi/ginkgo/v2 v2.21.0 h1:7rg/4f3rB88pb5obDgNZrNHrQ4e6WpjonchcpuBRnZM= github.com/onsi/ginkgo/v2 v2.21.0/go.mod h1:7Du3c42kxCUegi0IImZ1wUQzMBVecgIHjR1C+NkhLQo= github.com/onsi/gomega v1.35.0 h1:xuM1M/UvMp9BCdS4hojhS9/4jEuVqS9Er3bqupeaoPM= @@ -293,8 +285,8 @@ github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8 github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM= github.com/opencontainers/image-spec v1.1.0 h1:8SG7/vwALn54lVB/0yZ/MMwhFrPYtpEHQb2IpWsCzug= github.com/opencontainers/image-spec v1.1.0/go.mod h1:W4s4sFTMaBeK1BQLXbG4AdM2szdn85PY75RI83NrTrM= -github.com/pborman/uuid v1.2.1 h1:+ZZIw58t/ozdjRaXh/3awHfmWRbzYxJoAdNJxe/3pvw= -github.com/pborman/uuid v1.2.1/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k= +github.com/pivotal-cf/brokerapi/v11 v11.0.12-0.20241017212156-eb82c66fc625 h1:pYMwgrPJcXR21132Y0aBYcmxlE4rYjUVJaviy+y8SfI= +github.com/pivotal-cf/brokerapi/v11 v11.0.12-0.20241017212156-eb82c66fc625/go.mod h1:jmLwKyGB088yXAlo0lFHQptgdEUlIRR5TRd1oVFWero= github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA= github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= @@ -513,8 +505,6 @@ gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EV gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc= gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw= -gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= -gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= diff --git a/internal/appinfo/runtime_info_test.go b/internal/appinfo/runtime_info_test.go index 984f042a55..10ec4cf832 100644 --- a/internal/appinfo/runtime_info_test.go +++ b/internal/appinfo/runtime_info_test.go @@ -18,7 +18,7 @@ import ( "github.com/kyma-project/kyma-environment-broker/internal/logger" "github.com/kyma-project/kyma-environment-broker/internal/storage" "github.com/kyma-project/kyma-environment-broker/internal/storage/driver/memory" - "github.com/pivotal-cf/brokerapi/v8/domain" + "github.com/pivotal-cf/brokerapi/v11/domain" "github.com/sebdah/goldie/v2" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" diff --git a/internal/archive/service_test.go b/internal/archive/service_test.go index 46ab2beb49..561a260966 100644 --- a/internal/archive/service_test.go +++ b/internal/archive/service_test.go @@ -8,7 +8,7 @@ import ( "github.com/kyma-project/kyma-environment-broker/internal/fixture" "github.com/kyma-project/kyma-environment-broker/internal/storage" - "github.com/pivotal-cf/brokerapi/v8/domain" + "github.com/pivotal-cf/brokerapi/v11/domain" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/internal/broker/bind_create.go b/internal/broker/bind_create.go index a92566ed88..fb1c1a825e 100644 --- a/internal/broker/bind_create.go +++ b/internal/broker/bind_create.go @@ -13,9 +13,9 @@ import ( broker "github.com/kyma-project/kyma-environment-broker/internal/broker/bindings" "github.com/kyma-project/kyma-environment-broker/internal/storage" "github.com/kyma-project/kyma-environment-broker/internal/storage/dberr" - "github.com/pivotal-cf/brokerapi/v8/domain/apiresponses" + "github.com/pivotal-cf/brokerapi/v11/domain/apiresponses" - "github.com/pivotal-cf/brokerapi/v8/domain" + "github.com/pivotal-cf/brokerapi/v11/domain" "github.com/sirupsen/logrus" ) diff --git a/internal/broker/bind_create_test.go b/internal/broker/bind_create_test.go index 6901a2dd29..b8e82cd5d3 100644 --- a/internal/broker/bind_create_test.go +++ b/internal/broker/bind_create_test.go @@ -12,11 +12,10 @@ import ( "github.com/stretchr/testify/assert" "k8s.io/client-go/kubernetes" - "code.cloudfoundry.org/lager" "github.com/kyma-project/kyma-environment-broker/internal/fixture" "github.com/kyma-project/kyma-environment-broker/internal/storage" "github.com/kyma-project/kyma-environment-broker/internal/storage/dberr" - "github.com/pivotal-cf/brokerapi/v8/domain" + "github.com/pivotal-cf/brokerapi/v11/domain" "github.com/sirupsen/logrus" "github.com/stretchr/testify/require" ) diff --git a/internal/broker/bind_delete.go b/internal/broker/bind_delete.go index d5366c60f6..d1e9cf36be 100644 --- a/internal/broker/bind_delete.go +++ b/internal/broker/bind_delete.go @@ -9,8 +9,8 @@ import ( broker "github.com/kyma-project/kyma-environment-broker/internal/broker/bindings" "github.com/kyma-project/kyma-environment-broker/internal/storage" "github.com/kyma-project/kyma-environment-broker/internal/storage/dberr" - "github.com/pivotal-cf/brokerapi/v8/domain" - "github.com/pivotal-cf/brokerapi/v8/domain/apiresponses" + "github.com/pivotal-cf/brokerapi/v11/domain" + "github.com/pivotal-cf/brokerapi/v11/domain/apiresponses" "github.com/sirupsen/logrus" ) diff --git a/internal/broker/bind_get.go b/internal/broker/bind_get.go index 0cff03c247..cfad936e0f 100644 --- a/internal/broker/bind_get.go +++ b/internal/broker/bind_get.go @@ -9,8 +9,8 @@ import ( "github.com/kyma-project/kyma-environment-broker/internal" "github.com/kyma-project/kyma-environment-broker/internal/storage" - "github.com/pivotal-cf/brokerapi/v8/domain" - "github.com/pivotal-cf/brokerapi/v8/domain/apiresponses" + "github.com/pivotal-cf/brokerapi/v11/domain" + "github.com/pivotal-cf/brokerapi/v11/domain/apiresponses" "github.com/sirupsen/logrus" ) diff --git a/internal/broker/bind_get_test.go b/internal/broker/bind_get_test.go index a1a4498e96..514b7c30b1 100644 --- a/internal/broker/bind_get_test.go +++ b/internal/broker/bind_get_test.go @@ -10,8 +10,8 @@ import ( "github.com/kyma-project/kyma-environment-broker/internal" "github.com/kyma-project/kyma-environment-broker/internal/storage/driver/memory" - "github.com/pivotal-cf/brokerapi/v8/domain" - "github.com/pivotal-cf/brokerapi/v8/domain/apiresponses" + "github.com/pivotal-cf/brokerapi/v11/domain" + "github.com/pivotal-cf/brokerapi/v11/domain/apiresponses" "github.com/sirupsen/logrus" "github.com/stretchr/testify/require" ) diff --git a/internal/broker/bind_last_operation.go b/internal/broker/bind_last_operation.go index 726ab3b8de..129723c736 100644 --- a/internal/broker/bind_last_operation.go +++ b/internal/broker/bind_last_operation.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/pivotal-cf/brokerapi/v8/domain" + "github.com/pivotal-cf/brokerapi/v11/domain" "github.com/sirupsen/logrus" ) diff --git a/internal/broker/client.go b/internal/broker/client.go index f3d8dc9b64..db37b81a6d 100644 --- a/internal/broker/client.go +++ b/internal/broker/client.go @@ -9,7 +9,7 @@ import ( "time" "github.com/kyma-project/kyma-environment-broker/internal" - "github.com/pivotal-cf/brokerapi/v8/domain/apiresponses" + "github.com/pivotal-cf/brokerapi/v11/domain/apiresponses" "github.com/pkg/errors" "golang.org/x/oauth2/clientcredentials" diff --git a/internal/broker/instance_create.go b/internal/broker/instance_create.go index 757d7721fe..330a764fdd 100644 --- a/internal/broker/instance_create.go +++ b/internal/broker/instance_create.go @@ -27,8 +27,8 @@ import ( "github.com/google/uuid" "github.com/kyma-incubator/compass/components/director/pkg/jsonschema" - "github.com/pivotal-cf/brokerapi/v8/domain" - "github.com/pivotal-cf/brokerapi/v8/domain/apiresponses" + "github.com/pivotal-cf/brokerapi/v11/domain" + "github.com/pivotal-cf/brokerapi/v11/domain/apiresponses" "github.com/sirupsen/logrus" "github.com/kyma-project/kyma-environment-broker/common/gardener" diff --git a/internal/broker/instance_create_input_params_test.go b/internal/broker/instance_create_input_params_test.go index 75e0347cd1..b8435c96b6 100644 --- a/internal/broker/instance_create_input_params_test.go +++ b/internal/broker/instance_create_input_params_test.go @@ -6,7 +6,7 @@ import ( "github.com/kyma-project/kyma-environment-broker/common/gardener" "github.com/kyma-project/kyma-environment-broker/internal/dashboard" - "github.com/pivotal-cf/brokerapi/v8/domain" + "github.com/pivotal-cf/brokerapi/v11/domain" "github.com/sirupsen/logrus" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/internal/broker/instance_create_test.go b/internal/broker/instance_create_test.go index e17cb39689..df7399ac5a 100644 --- a/internal/broker/instance_create_test.go +++ b/internal/broker/instance_create_test.go @@ -9,7 +9,7 @@ import ( "github.com/kyma-project/kyma-environment-broker/internal/whitelist" - "github.com/pivotal-cf/brokerapi/v8/domain/apiresponses" + "github.com/pivotal-cf/brokerapi/v11/domain/apiresponses" "github.com/kyma-project/control-plane/components/provisioner/pkg/gqlschema" "github.com/kyma-project/kyma-environment-broker/common/gardener" @@ -22,7 +22,7 @@ import ( "github.com/kyma-project/kyma-environment-broker/internal/middleware" "github.com/kyma-project/kyma-environment-broker/internal/ptr" "github.com/kyma-project/kyma-environment-broker/internal/storage" - "github.com/pivotal-cf/brokerapi/v8/domain" + "github.com/pivotal-cf/brokerapi/v11/domain" "github.com/sirupsen/logrus" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" diff --git a/internal/broker/instance_deprovision.go b/internal/broker/instance_deprovision.go index 8c1dbdf990..1ec357bd99 100644 --- a/internal/broker/instance_deprovision.go +++ b/internal/broker/instance_deprovision.go @@ -11,8 +11,8 @@ import ( "github.com/kyma-project/kyma-environment-broker/internal/storage" "github.com/kyma-project/kyma-environment-broker/internal/storage/dberr" - "github.com/pivotal-cf/brokerapi/v8/domain" - "github.com/pivotal-cf/brokerapi/v8/domain/apiresponses" + "github.com/pivotal-cf/brokerapi/v11/domain" + "github.com/pivotal-cf/brokerapi/v11/domain/apiresponses" "github.com/sirupsen/logrus" ) diff --git a/internal/broker/instance_deprovision_test.go b/internal/broker/instance_deprovision_test.go index 419682b10d..4dcb8052aa 100644 --- a/internal/broker/instance_deprovision_test.go +++ b/internal/broker/instance_deprovision_test.go @@ -8,7 +8,7 @@ import ( "github.com/kyma-project/kyma-environment-broker/internal/broker/automock" "github.com/kyma-project/kyma-environment-broker/internal/fixture" "github.com/kyma-project/kyma-environment-broker/internal/storage" - "github.com/pivotal-cf/brokerapi/v8/domain" + "github.com/pivotal-cf/brokerapi/v11/domain" "github.com/sirupsen/logrus" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" diff --git a/internal/broker/instance_get.go b/internal/broker/instance_get.go index 318e087dc7..7c8e5e3d41 100644 --- a/internal/broker/instance_get.go +++ b/internal/broker/instance_get.go @@ -12,8 +12,8 @@ import ( "github.com/kyma-project/kyma-environment-broker/internal/storage" "github.com/kyma-project/kyma-environment-broker/internal/storage/dberr" - "github.com/pivotal-cf/brokerapi/v8/domain" - "github.com/pivotal-cf/brokerapi/v8/domain/apiresponses" + "github.com/pivotal-cf/brokerapi/v11/domain" + "github.com/pivotal-cf/brokerapi/v11/domain/apiresponses" "github.com/sirupsen/logrus" ) diff --git a/internal/broker/instance_get_test.go b/internal/broker/instance_get_test.go index 0433b558f4..2d57c90391 100644 --- a/internal/broker/instance_get_test.go +++ b/internal/broker/instance_get_test.go @@ -18,8 +18,8 @@ import ( "github.com/kyma-project/kyma-environment-broker/internal/fixture" kcMock "github.com/kyma-project/kyma-environment-broker/internal/kubeconfig/automock" "github.com/kyma-project/kyma-environment-broker/internal/storage" - "github.com/pivotal-cf/brokerapi/v8/domain" - "github.com/pivotal-cf/brokerapi/v8/domain/apiresponses" + "github.com/pivotal-cf/brokerapi/v11/domain" + "github.com/pivotal-cf/brokerapi/v11/domain/apiresponses" "github.com/sirupsen/logrus" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" diff --git a/internal/broker/instance_last_operation.go b/internal/broker/instance_last_operation.go index 5f765340d4..9ffae279cf 100644 --- a/internal/broker/instance_last_operation.go +++ b/internal/broker/instance_last_operation.go @@ -9,8 +9,8 @@ import ( "github.com/kyma-project/kyma-environment-broker/internal" "github.com/kyma-project/kyma-environment-broker/internal/storage" "github.com/kyma-project/kyma-environment-broker/internal/storage/dberr" - "github.com/pivotal-cf/brokerapi/v8/domain" - "github.com/pivotal-cf/brokerapi/v8/domain/apiresponses" + "github.com/pivotal-cf/brokerapi/v11/domain" + "github.com/pivotal-cf/brokerapi/v11/domain/apiresponses" "github.com/sirupsen/logrus" ) diff --git a/internal/broker/instance_last_operation_test.go b/internal/broker/instance_last_operation_test.go index 8ce5d99379..eac5d0a3d4 100644 --- a/internal/broker/instance_last_operation_test.go +++ b/internal/broker/instance_last_operation_test.go @@ -10,7 +10,7 @@ import ( "github.com/kyma-project/kyma-environment-broker/internal/broker" "github.com/kyma-project/kyma-environment-broker/internal/fixture" "github.com/kyma-project/kyma-environment-broker/internal/storage" - "github.com/pivotal-cf/brokerapi/v8/domain" + "github.com/pivotal-cf/brokerapi/v11/domain" "github.com/sirupsen/logrus" "github.com/stretchr/testify/assert" ) diff --git a/internal/broker/instance_update.go b/internal/broker/instance_update.go index c14824a638..dd4b220b86 100644 --- a/internal/broker/instance_update.go +++ b/internal/broker/instance_update.go @@ -16,8 +16,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "github.com/google/uuid" - "github.com/pivotal-cf/brokerapi/v8/domain" - "github.com/pivotal-cf/brokerapi/v8/domain/apiresponses" + "github.com/pivotal-cf/brokerapi/v11/domain" + "github.com/pivotal-cf/brokerapi/v11/domain/apiresponses" "github.com/sirupsen/logrus" "k8s.io/apimachinery/pkg/util/wait" diff --git a/internal/broker/instance_update_test.go b/internal/broker/instance_update_test.go index 985ac9c75f..406f681f61 100644 --- a/internal/broker/instance_update_test.go +++ b/internal/broker/instance_update_test.go @@ -29,8 +29,8 @@ import ( kcMock "github.com/kyma-project/kyma-environment-broker/internal/kubeconfig/automock" "github.com/kyma-project/kyma-environment-broker/internal/ptr" "github.com/kyma-project/kyma-environment-broker/internal/storage" - "github.com/pivotal-cf/brokerapi/v8/domain" - "github.com/pivotal-cf/brokerapi/v8/domain/apiresponses" + "github.com/pivotal-cf/brokerapi/v11/domain" + "github.com/pivotal-cf/brokerapi/v11/domain/apiresponses" "github.com/sirupsen/logrus" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/internal/broker/plans.go b/internal/broker/plans.go index 4e20979ee6..d3d774a0cc 100644 --- a/internal/broker/plans.go +++ b/internal/broker/plans.go @@ -5,7 +5,7 @@ import ( "github.com/kyma-incubator/compass/components/director/pkg/jsonschema" - "github.com/pivotal-cf/brokerapi/v8/domain" + "github.com/pivotal-cf/brokerapi/v11/domain" "github.com/kyma-project/kyma-environment-broker/internal" ) diff --git a/internal/broker/response_labels.go b/internal/broker/response_labels.go index b77cfa529c..356f2178bc 100644 --- a/internal/broker/response_labels.go +++ b/internal/broker/response_labels.go @@ -26,11 +26,11 @@ const ( " To continue using Kyma, you must use a paid service plan. To learn more about the available plans, follow the link to the documentation." ) -func ResponseLabels(op internal.ProvisioningOperation, instance internal.Instance, brokerURL string, enableKubeconfigLabel bool, kubeconfigBuilder kubeconfig.KcBuilder) map[string]string { +func ResponseLabels(op internal.ProvisioningOperation, instance internal.Instance, brokerURL string, enableKubeconfigLabel bool, kubeconfigBuilder kubeconfig.KcBuilder) map[string]any { brokerURL = strings.TrimLeft(brokerURL, "https://") brokerURL = strings.TrimLeft(brokerURL, "http://") - responseLabels := make(map[string]string, 0) + responseLabels := make(map[string]any, 0) responseLabels["Name"] = op.ProvisioningParameters.Parameters.Name if enableKubeconfigLabel && !IsOwnClusterPlan(instance.ServicePlanID) { responseLabels[kubeconfigURLKey] = fmt.Sprintf("https://%s/kubeconfig/%s", brokerURL, instance.InstanceID) @@ -57,7 +57,7 @@ func ResponseLabelsWithExpirationInfo( expiryDetailsKey string, expiredInfoFormat string, kubeconfigBuilder kubeconfig.KcBuilder, -) map[string]string { +) map[string]any { labels := ResponseLabels(op, instance, brokerURL, enableKubeconfigLabel, kubeconfigBuilder) expireTime := instance.CreatedAt.Add(expireDuration) diff --git a/internal/broker/server.go b/internal/broker/server.go index 54e61a367f..959fe0fbc9 100644 --- a/internal/broker/server.go +++ b/internal/broker/server.go @@ -3,14 +3,14 @@ package broker import ( "context" "fmt" + "log/slog" "net/http" "time" - "code.cloudfoundry.org/lager" "github.com/gorilla/mux" - "github.com/pivotal-cf/brokerapi/v8/domain" - "github.com/pivotal-cf/brokerapi/v8/handlers" - "github.com/pivotal-cf/brokerapi/v8/middlewares" + "github.com/pivotal-cf/brokerapi/v11/domain" + "github.com/pivotal-cf/brokerapi/v11/handlers" + "github.com/pivotal-cf/brokerapi/v11/middlewares" ) type CreateBindingHandler struct { @@ -22,7 +22,7 @@ func (h CreateBindingHandler) ServeHTTP(rw http.ResponseWriter, r *http.Request) } // copied from github.com/pivotal-cf/brokerapi/api.go -func AttachRoutes(router *mux.Router, serviceBroker domain.ServiceBroker, logger lager.Logger, createBindingTimeout time.Duration) *mux.Router { +func AttachRoutes(router *mux.Router, serviceBroker domain.ServiceBroker, logger *slog.Logger, createBindingTimeout time.Duration) *mux.Router { apiHandler := handlers.NewApiHandler(serviceBroker, logger) deprovision := func(w http.ResponseWriter, req *http.Request) { req2 := req.WithContext(context.WithValue(req.Context(), "User-Agent", req.Header.Get("User-Agent"))) @@ -43,7 +43,7 @@ func AttachRoutes(router *mux.Router, serviceBroker domain.ServiceBroker, logger router.HandleFunc("/v2/service_instances/{instance_id}/service_bindings/{binding_id}/last_operation", apiHandler.LastBindingOperation).Methods("GET") router.Use(middlewares.AddCorrelationIDToContext) - apiVersionMiddleware := middlewares.APIVersionMiddleware{LoggerFactory: logger} + apiVersionMiddleware := middlewares.APIVersionMiddleware{Logger: logger} router.Use(middlewares.AddOriginatingIdentityToContext) router.Use(apiVersionMiddleware.ValidateAPIVersionHdr) diff --git a/internal/broker/services.go b/internal/broker/services.go index 643e5f56d9..bfd7c03e31 100644 --- a/internal/broker/services.go +++ b/internal/broker/services.go @@ -10,7 +10,7 @@ import ( "github.com/kyma-project/kyma-environment-broker/internal/middleware" - "github.com/pivotal-cf/brokerapi/v8/domain" + "github.com/pivotal-cf/brokerapi/v11/domain" "github.com/sirupsen/logrus" ) diff --git a/internal/broker/services_test.go b/internal/broker/services_test.go index 6d4d0b45ca..e63688a978 100644 --- a/internal/broker/services_test.go +++ b/internal/broker/services_test.go @@ -6,7 +6,7 @@ import ( "testing" "github.com/kyma-project/kyma-environment-broker/internal/broker" - "github.com/pivotal-cf/brokerapi/v8/domain" + "github.com/pivotal-cf/brokerapi/v11/domain" "github.com/sirupsen/logrus" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/internal/expiration/handler.go b/internal/expiration/handler.go index 6f437a430c..fb11f2ca57 100644 --- a/internal/expiration/handler.go +++ b/internal/expiration/handler.go @@ -16,7 +16,7 @@ import ( "github.com/kyma-project/kyma-environment-broker/internal/storage" "github.com/kyma-project/kyma-environment-broker/internal/storage/dberr" "github.com/kyma-project/kyma-environment-broker/internal/suspension" - "github.com/pivotal-cf/brokerapi/v8/domain" + "github.com/pivotal-cf/brokerapi/v11/domain" "github.com/sirupsen/logrus" ) diff --git a/internal/expiration/handler_test.go b/internal/expiration/handler_test.go index 3ce79a1e68..fc14b4c8d2 100644 --- a/internal/expiration/handler_test.go +++ b/internal/expiration/handler_test.go @@ -15,7 +15,7 @@ import ( "github.com/kyma-project/kyma-environment-broker/internal/fixture" "github.com/kyma-project/kyma-environment-broker/internal/process" "github.com/kyma-project/kyma-environment-broker/internal/storage" - "github.com/pivotal-cf/brokerapi/v8/domain" + "github.com/pivotal-cf/brokerapi/v11/domain" "github.com/sirupsen/logrus" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/internal/fixture/fixture.go b/internal/fixture/fixture.go index 0b08e5bd93..392352de59 100644 --- a/internal/fixture/fixture.go +++ b/internal/fixture/fixture.go @@ -9,7 +9,7 @@ import ( "github.com/kyma-project/kyma-environment-broker/common/orchestration" "github.com/kyma-project/kyma-environment-broker/internal" "github.com/kyma-project/kyma-environment-broker/internal/ptr" - "github.com/pivotal-cf/brokerapi/v8/domain" + "github.com/pivotal-cf/brokerapi/v11/domain" ) const ( diff --git a/internal/kubeconfig/handler.go b/internal/kubeconfig/handler.go index 7d76831af4..370267f339 100644 --- a/internal/kubeconfig/handler.go +++ b/internal/kubeconfig/handler.go @@ -14,7 +14,7 @@ import ( "github.com/kyma-project/kyma-environment-broker/internal/storage/dberr" "github.com/gorilla/mux" - "github.com/pivotal-cf/brokerapi/v8/domain" + "github.com/pivotal-cf/brokerapi/v11/domain" "github.com/sirupsen/logrus" ) diff --git a/internal/kubeconfig/handler_test.go b/internal/kubeconfig/handler_test.go index 2d34c0db61..49768c7b9c 100644 --- a/internal/kubeconfig/handler_test.go +++ b/internal/kubeconfig/handler_test.go @@ -17,7 +17,7 @@ import ( "github.com/kyma-project/kyma-environment-broker/internal/storage" "github.com/gorilla/mux" - "github.com/pivotal-cf/brokerapi/v8/domain" + "github.com/pivotal-cf/brokerapi/v11/domain" "github.com/stretchr/testify/require" ) diff --git a/internal/metricsv2/metrics.go b/internal/metricsv2/metrics.go index 89b4b690a8..cb61cdbef4 100644 --- a/internal/metricsv2/metrics.go +++ b/internal/metricsv2/metrics.go @@ -11,7 +11,7 @@ import ( "github.com/kyma-project/kyma-environment-broker/internal/event" "github.com/kyma-project/kyma-environment-broker/internal/process" "github.com/kyma-project/kyma-environment-broker/internal/storage" - "github.com/pivotal-cf/brokerapi/v8/domain" + "github.com/pivotal-cf/brokerapi/v11/domain" "github.com/prometheus/client_golang/prometheus" "github.com/sirupsen/logrus" ) diff --git a/internal/metricsv2/operation_duration.go b/internal/metricsv2/operation_duration.go index 63565c39e0..21798bd684 100644 --- a/internal/metricsv2/operation_duration.go +++ b/internal/metricsv2/operation_duration.go @@ -8,7 +8,7 @@ import ( "github.com/kyma-project/kyma-environment-broker/internal/process" "github.com/sirupsen/logrus" - "github.com/pivotal-cf/brokerapi/v8/domain" + "github.com/pivotal-cf/brokerapi/v11/domain" "github.com/prometheus/client_golang/prometheus" ) diff --git a/internal/metricsv2/operations_result.go b/internal/metricsv2/operations_result.go index 46df6fd70a..40dc3b9810 100644 --- a/internal/metricsv2/operations_result.go +++ b/internal/metricsv2/operations_result.go @@ -10,7 +10,7 @@ import ( "github.com/kyma-project/kyma-environment-broker/internal" "github.com/kyma-project/kyma-environment-broker/internal/storage" - "github.com/pivotal-cf/brokerapi/v8/domain" + "github.com/pivotal-cf/brokerapi/v11/domain" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" "github.com/sirupsen/logrus" diff --git a/internal/metricsv2/operations_result_test.go b/internal/metricsv2/operations_result_test.go index 4e2f346ac0..685c164aa3 100644 --- a/internal/metricsv2/operations_result_test.go +++ b/internal/metricsv2/operations_result_test.go @@ -10,7 +10,7 @@ import ( "github.com/kyma-project/kyma-environment-broker/internal/event" "github.com/kyma-project/kyma-environment-broker/internal/process" "github.com/kyma-project/kyma-environment-broker/internal/storage" - "github.com/pivotal-cf/brokerapi/v8/domain" + "github.com/pivotal-cf/brokerapi/v11/domain" "github.com/prometheus/client_golang/prometheus/testutil" "github.com/sirupsen/logrus" "github.com/stretchr/testify/assert" diff --git a/internal/metricsv2/operations_stats.go b/internal/metricsv2/operations_stats.go index 684d7f7ec6..75c3d7b837 100644 --- a/internal/metricsv2/operations_stats.go +++ b/internal/metricsv2/operations_stats.go @@ -12,7 +12,7 @@ import ( "github.com/kyma-project/kyma-environment-broker/internal/broker" "github.com/kyma-project/kyma-environment-broker/internal/process" "github.com/kyma-project/kyma-environment-broker/internal/storage" - "github.com/pivotal-cf/brokerapi/v8/domain" + "github.com/pivotal-cf/brokerapi/v11/domain" "github.com/prometheus/client_golang/prometheus" "github.com/sirupsen/logrus" ) diff --git a/internal/metricsv2/operations_stats_test.go b/internal/metricsv2/operations_stats_test.go index 9357e19a21..7b58359482 100644 --- a/internal/metricsv2/operations_stats_test.go +++ b/internal/metricsv2/operations_stats_test.go @@ -10,7 +10,7 @@ import ( "github.com/kyma-project/kyma-environment-broker/internal/broker" "github.com/kyma-project/kyma-environment-broker/internal/process" "github.com/kyma-project/kyma-environment-broker/internal/storage" - "github.com/pivotal-cf/brokerapi/v8/domain" + "github.com/pivotal-cf/brokerapi/v11/domain" "github.com/prometheus/client_golang/prometheus/testutil" log "github.com/sirupsen/logrus" "github.com/stretchr/testify/assert" diff --git a/internal/model.go b/internal/model.go index 32172da9a5..c8e766f72a 100644 --- a/internal/model.go +++ b/internal/model.go @@ -13,7 +13,7 @@ import ( kebError "github.com/kyma-project/kyma-environment-broker/internal/error" "github.com/kyma-project/kyma-environment-broker/internal/events" "github.com/kyma-project/kyma-environment-broker/internal/ptr" - "github.com/pivotal-cf/brokerapi/v8/domain" + "github.com/pivotal-cf/brokerapi/v11/domain" log "github.com/sirupsen/logrus" ) diff --git a/internal/orchestration/handlers/orchestration_handler_test.go b/internal/orchestration/handlers/orchestration_handler_test.go index 29f7e8f781..0658fb5031 100644 --- a/internal/orchestration/handlers/orchestration_handler_test.go +++ b/internal/orchestration/handlers/orchestration_handler_test.go @@ -16,7 +16,7 @@ import ( "github.com/kyma-project/kyma-environment-broker/internal/fixture" "github.com/kyma-project/kyma-environment-broker/internal/process" "github.com/kyma-project/kyma-environment-broker/internal/storage" - "github.com/pivotal-cf/brokerapi/v8/domain" + "github.com/pivotal-cf/brokerapi/v11/domain" "github.com/sirupsen/logrus" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/internal/orchestration/manager/manager.go b/internal/orchestration/manager/manager.go index 0ad8775b13..685d510064 100644 --- a/internal/orchestration/manager/manager.go +++ b/internal/orchestration/manager/manager.go @@ -19,7 +19,7 @@ import ( "github.com/kyma-project/kyma-environment-broker/internal/notification" "github.com/kyma-project/kyma-environment-broker/internal/storage" "github.com/kyma-project/kyma-environment-broker/internal/storage/dberr" - "github.com/pivotal-cf/brokerapi/v8/domain" + "github.com/pivotal-cf/brokerapi/v11/domain" "github.com/sirupsen/logrus" ) diff --git a/internal/orchestration/manager/upgrade_cluster.go b/internal/orchestration/manager/upgrade_cluster.go index 909078d5fd..64b1fd8b38 100644 --- a/internal/orchestration/manager/upgrade_cluster.go +++ b/internal/orchestration/manager/upgrade_cluster.go @@ -16,7 +16,7 @@ import ( "github.com/kyma-project/kyma-environment-broker/internal/process" "github.com/kyma-project/kyma-environment-broker/internal/storage" "github.com/kyma-project/kyma-environment-broker/internal/storage/dbmodel" - "github.com/pivotal-cf/brokerapi/v8/domain" + "github.com/pivotal-cf/brokerapi/v11/domain" "github.com/sirupsen/logrus" ) diff --git a/internal/process/deprovisioning/check_runtime_removal_step_test.go b/internal/process/deprovisioning/check_runtime_removal_step_test.go index 2813a050d2..202adda310 100644 --- a/internal/process/deprovisioning/check_runtime_removal_step_test.go +++ b/internal/process/deprovisioning/check_runtime_removal_step_test.go @@ -9,7 +9,7 @@ import ( "github.com/kyma-project/control-plane/components/provisioner/pkg/gqlschema" "github.com/kyma-project/kyma-environment-broker/internal/provisioner" "github.com/kyma-project/kyma-environment-broker/internal/storage" - "github.com/pivotal-cf/brokerapi/v8/domain" + "github.com/pivotal-cf/brokerapi/v11/domain" "github.com/sirupsen/logrus" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/internal/process/deprovisioning/init.go b/internal/process/deprovisioning/init.go index 563c433b5a..43267e0292 100644 --- a/internal/process/deprovisioning/init.go +++ b/internal/process/deprovisioning/init.go @@ -9,7 +9,7 @@ import ( "github.com/kyma-project/kyma-environment-broker/internal/process" "github.com/kyma-project/kyma-environment-broker/internal/storage" "github.com/kyma-project/kyma-environment-broker/internal/storage/dberr" - "github.com/pivotal-cf/brokerapi/v8/domain" + "github.com/pivotal-cf/brokerapi/v11/domain" "github.com/sirupsen/logrus" ) diff --git a/internal/process/deprovisioning/init_test.go b/internal/process/deprovisioning/init_test.go index 2882621f8b..721fb14000 100644 --- a/internal/process/deprovisioning/init_test.go +++ b/internal/process/deprovisioning/init_test.go @@ -8,7 +8,7 @@ import ( "github.com/kyma-project/kyma-environment-broker/internal" "github.com/kyma-project/kyma-environment-broker/internal/fixture" "github.com/kyma-project/kyma-environment-broker/internal/storage" - "github.com/pivotal-cf/brokerapi/v8/domain" + "github.com/pivotal-cf/brokerapi/v11/domain" "github.com/sirupsen/logrus" "github.com/stretchr/testify/assert" ) diff --git a/internal/process/deprovisioning/release_subscription_step_test.go b/internal/process/deprovisioning/release_subscription_step_test.go index b5d449e292..29f35b79f0 100644 --- a/internal/process/deprovisioning/release_subscription_step_test.go +++ b/internal/process/deprovisioning/release_subscription_step_test.go @@ -12,7 +12,7 @@ import ( "github.com/kyma-project/kyma-environment-broker/internal/broker" "github.com/kyma-project/kyma-environment-broker/internal/fixture" "github.com/kyma-project/kyma-environment-broker/internal/storage" - "github.com/pivotal-cf/brokerapi/v8/domain" + "github.com/pivotal-cf/brokerapi/v11/domain" "github.com/sirupsen/logrus" "github.com/stretchr/testify/assert" ) diff --git a/internal/process/operation_manager.go b/internal/process/operation_manager.go index ab2d43f0e2..14826cda3c 100644 --- a/internal/process/operation_manager.go +++ b/internal/process/operation_manager.go @@ -8,7 +8,7 @@ import ( "github.com/kyma-project/kyma-environment-broker/internal" "github.com/kyma-project/kyma-environment-broker/internal/storage" "github.com/kyma-project/kyma-environment-broker/internal/storage/dberr" - "github.com/pivotal-cf/brokerapi/v8/domain" + "github.com/pivotal-cf/brokerapi/v11/domain" "github.com/sirupsen/logrus" ) diff --git a/internal/process/provisioning/check_runtime_step_test.go b/internal/process/provisioning/check_runtime_step_test.go index e88344b6c5..c3f10eb87d 100644 --- a/internal/process/provisioning/check_runtime_step_test.go +++ b/internal/process/provisioning/check_runtime_step_test.go @@ -10,7 +10,7 @@ import ( "github.com/kyma-project/kyma-environment-broker/internal/provisioner" "github.com/kyma-project/kyma-environment-broker/internal/ptr" "github.com/kyma-project/kyma-environment-broker/internal/storage" - "github.com/pivotal-cf/brokerapi/v8/domain" + "github.com/pivotal-cf/brokerapi/v11/domain" "github.com/sirupsen/logrus" "github.com/stretchr/testify/assert" ) diff --git a/internal/process/provisioning/create_resource_names_step_test.go b/internal/process/provisioning/create_resource_names_step_test.go index 0d6cd00aee..a2e4bfdcc9 100644 --- a/internal/process/provisioning/create_resource_names_step_test.go +++ b/internal/process/provisioning/create_resource_names_step_test.go @@ -13,7 +13,7 @@ import ( "github.com/kyma-project/kyma-environment-broker/internal/process/input" "github.com/kyma-project/kyma-environment-broker/internal/ptr" "github.com/kyma-project/kyma-environment-broker/internal/storage" - "github.com/pivotal-cf/brokerapi/v8/domain" + "github.com/pivotal-cf/brokerapi/v11/domain" coreV1 "k8s.io/api/core/v1" metaV1 "k8s.io/apimachinery/pkg/apis/meta/v1" k8sruntime "k8s.io/apimachinery/pkg/runtime" diff --git a/internal/process/provisioning/create_runtime_resource_step_test.go b/internal/process/provisioning/create_runtime_resource_step_test.go index 8df40e0b91..1a406f84b0 100644 --- a/internal/process/provisioning/create_runtime_resource_step_test.go +++ b/internal/process/provisioning/create_runtime_resource_step_test.go @@ -12,7 +12,7 @@ import ( "github.com/kyma-project/kyma-environment-broker/internal/provider" - "github.com/pivotal-cf/brokerapi/v8/domain" + "github.com/pivotal-cf/brokerapi/v11/domain" "github.com/kyma-project/kyma-environment-broker/internal/networking" diff --git a/internal/process/provisioning/create_runtime_without_kyma_test.go b/internal/process/provisioning/create_runtime_without_kyma_test.go index 253de3d15f..8b292b7c78 100644 --- a/internal/process/provisioning/create_runtime_without_kyma_test.go +++ b/internal/process/provisioning/create_runtime_without_kyma_test.go @@ -11,7 +11,7 @@ import ( provisionerAutomock "github.com/kyma-project/kyma-environment-broker/internal/provisioner/automock" "github.com/kyma-project/kyma-environment-broker/internal/ptr" "github.com/kyma-project/kyma-environment-broker/internal/storage" - "github.com/pivotal-cf/brokerapi/v8/domain" + "github.com/pivotal-cf/brokerapi/v11/domain" "github.com/sirupsen/logrus" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" diff --git a/internal/process/provisioning/initialisation_test.go b/internal/process/provisioning/initialisation_test.go index f05fc676f6..62cfa15429 100644 --- a/internal/process/provisioning/initialisation_test.go +++ b/internal/process/provisioning/initialisation_test.go @@ -8,7 +8,7 @@ import ( "github.com/kyma-project/kyma-environment-broker/internal/fixture" automock2 "github.com/kyma-project/kyma-environment-broker/internal/process/input/automock" "github.com/kyma-project/kyma-environment-broker/internal/storage" - "github.com/pivotal-cf/brokerapi/v8/domain" + "github.com/pivotal-cf/brokerapi/v11/domain" "github.com/sirupsen/logrus" "github.com/stretchr/testify/assert" ) diff --git a/internal/process/provisioning/inject_btp_operator_credentials_step_test.go b/internal/process/provisioning/inject_btp_operator_credentials_step_test.go index 7593ce4dd4..e237d10322 100644 --- a/internal/process/provisioning/inject_btp_operator_credentials_step_test.go +++ b/internal/process/provisioning/inject_btp_operator_credentials_step_test.go @@ -12,7 +12,7 @@ import ( "github.com/kyma-project/kyma-environment-broker/internal" "github.com/kyma-project/kyma-environment-broker/internal/fixture" "github.com/kyma-project/kyma-environment-broker/internal/storage" - "github.com/pivotal-cf/brokerapi/v8/domain" + "github.com/pivotal-cf/brokerapi/v11/domain" "github.com/sirupsen/logrus" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/internal/process/provisioning/resolve_creds_test.go b/internal/process/provisioning/resolve_creds_test.go index ed26866ea8..0c8072445d 100644 --- a/internal/process/provisioning/resolve_creds_test.go +++ b/internal/process/provisioning/resolve_creds_test.go @@ -10,7 +10,7 @@ import ( "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/runtime/schema" - "github.com/pivotal-cf/brokerapi/v8/domain" + "github.com/pivotal-cf/brokerapi/v11/domain" "github.com/kyma-project/kyma-environment-broker/internal" diff --git a/internal/process/provisioning/start_step.go b/internal/process/provisioning/start_step.go index 89fd7e11e2..b87bab4022 100644 --- a/internal/process/provisioning/start_step.go +++ b/internal/process/provisioning/start_step.go @@ -7,7 +7,7 @@ import ( "github.com/kyma-project/kyma-environment-broker/internal/process" "github.com/kyma-project/kyma-environment-broker/internal/storage" "github.com/kyma-project/kyma-environment-broker/internal/storage/dberr" - "github.com/pivotal-cf/brokerapi/v8/domain" + "github.com/pivotal-cf/brokerapi/v11/domain" "github.com/sirupsen/logrus" "github.com/kyma-project/kyma-environment-broker/internal" diff --git a/internal/process/provisioning/start_step_test.go b/internal/process/provisioning/start_step_test.go index 8822d7893a..3133d45696 100644 --- a/internal/process/provisioning/start_step_test.go +++ b/internal/process/provisioning/start_step_test.go @@ -5,7 +5,7 @@ import ( "github.com/kyma-project/kyma-environment-broker/common/orchestration" "github.com/kyma-project/kyma-environment-broker/internal/fixture" - "github.com/pivotal-cf/brokerapi/v8/domain" + "github.com/pivotal-cf/brokerapi/v11/domain" "github.com/sirupsen/logrus" "github.com/stretchr/testify/assert" diff --git a/internal/process/staged_manager.go b/internal/process/staged_manager.go index 51b4d19774..9f8cf01cb0 100644 --- a/internal/process/staged_manager.go +++ b/internal/process/staged_manager.go @@ -17,7 +17,7 @@ import ( "github.com/kyma-project/kyma-environment-broker/internal/event" "github.com/kyma-project/kyma-environment-broker/internal/storage" - "github.com/pivotal-cf/brokerapi/v8/domain" + "github.com/pivotal-cf/brokerapi/v11/domain" "github.com/sirupsen/logrus" ) diff --git a/internal/process/staged_manager_test.go b/internal/process/staged_manager_test.go index 83cf8cc4ab..d8a0ba1995 100644 --- a/internal/process/staged_manager_test.go +++ b/internal/process/staged_manager_test.go @@ -13,7 +13,7 @@ import ( "github.com/kyma-project/kyma-environment-broker/internal/broker" "github.com/kyma-project/kyma-environment-broker/internal/fixture" - "github.com/pivotal-cf/brokerapi/v8/domain" + "github.com/pivotal-cf/brokerapi/v11/domain" "k8s.io/apimachinery/pkg/util/wait" "github.com/kyma-project/kyma-environment-broker/internal" diff --git a/internal/process/steps/gardener_cluster_test.go b/internal/process/steps/gardener_cluster_test.go index 08c0015c04..255acc8e37 100644 --- a/internal/process/steps/gardener_cluster_test.go +++ b/internal/process/steps/gardener_cluster_test.go @@ -7,7 +7,7 @@ import ( "github.com/kyma-project/kyma-environment-broker/internal/broker" - "github.com/pivotal-cf/brokerapi/v8/domain" + "github.com/pivotal-cf/brokerapi/v11/domain" "github.com/kyma-project/kyma-environment-broker/internal" "github.com/kyma-project/kyma-environment-broker/internal/fixture" diff --git a/internal/process/steps/runtime_resource_test.go b/internal/process/steps/runtime_resource_test.go index aa44dc83d5..44ffda8b30 100644 --- a/internal/process/steps/runtime_resource_test.go +++ b/internal/process/steps/runtime_resource_test.go @@ -9,7 +9,7 @@ import ( imv1 "github.com/kyma-project/infrastructure-manager/api/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/pivotal-cf/brokerapi/v8/domain" + "github.com/pivotal-cf/brokerapi/v11/domain" "github.com/kyma-project/kyma-environment-broker/internal/fixture" "github.com/kyma-project/kyma-environment-broker/internal/storage" diff --git a/internal/process/update/check_step_test.go b/internal/process/update/check_step_test.go index 4ffa059297..aa2a70c814 100644 --- a/internal/process/update/check_step_test.go +++ b/internal/process/update/check_step_test.go @@ -10,7 +10,7 @@ import ( "github.com/kyma-project/kyma-environment-broker/internal/provisioner" "github.com/kyma-project/kyma-environment-broker/internal/ptr" "github.com/kyma-project/kyma-environment-broker/internal/storage" - "github.com/pivotal-cf/brokerapi/v8/domain" + "github.com/pivotal-cf/brokerapi/v11/domain" "github.com/sirupsen/logrus" "github.com/stretchr/testify/assert" ) diff --git a/internal/process/update/initialisation_step.go b/internal/process/update/initialisation_step.go index 3d41173af3..a132125840 100644 --- a/internal/process/update/initialisation_step.go +++ b/internal/process/update/initialisation_step.go @@ -12,7 +12,7 @@ import ( "github.com/kyma-project/kyma-environment-broker/internal/process" "github.com/kyma-project/kyma-environment-broker/internal/process/input" "github.com/kyma-project/kyma-environment-broker/internal/storage" - "github.com/pivotal-cf/brokerapi/v8/domain" + "github.com/pivotal-cf/brokerapi/v11/domain" "github.com/sirupsen/logrus" ) diff --git a/internal/process/update/initialisation_step_test.go b/internal/process/update/initialisation_step_test.go index bb4c104b4a..f8ac11cd67 100644 --- a/internal/process/update/initialisation_step_test.go +++ b/internal/process/update/initialisation_step_test.go @@ -7,7 +7,7 @@ import ( "github.com/kyma-project/kyma-environment-broker/internal/fixture" "github.com/kyma-project/kyma-environment-broker/internal/process/input/automock" "github.com/kyma-project/kyma-environment-broker/internal/storage" - "github.com/pivotal-cf/brokerapi/v8/domain" + "github.com/pivotal-cf/brokerapi/v11/domain" "github.com/sirupsen/logrus" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" diff --git a/internal/process/upgrade_cluster/initialisation.go b/internal/process/upgrade_cluster/initialisation.go index 9c33c2f801..c5b888a283 100644 --- a/internal/process/upgrade_cluster/initialisation.go +++ b/internal/process/upgrade_cluster/initialisation.go @@ -13,7 +13,7 @@ import ( "github.com/kyma-project/kyma-environment-broker/internal/process/input" "github.com/kyma-project/kyma-environment-broker/internal/provisioner" "github.com/kyma-project/kyma-environment-broker/internal/storage" - "github.com/pivotal-cf/brokerapi/v8/domain" + "github.com/pivotal-cf/brokerapi/v11/domain" "github.com/sirupsen/logrus" ) diff --git a/internal/process/upgrade_cluster/initialisation_test.go b/internal/process/upgrade_cluster/initialisation_test.go index d8d2256ac9..8beb499f81 100644 --- a/internal/process/upgrade_cluster/initialisation_test.go +++ b/internal/process/upgrade_cluster/initialisation_test.go @@ -14,7 +14,7 @@ import ( cloudProvider "github.com/kyma-project/kyma-environment-broker/internal/provider" provisionerAutomock "github.com/kyma-project/kyma-environment-broker/internal/provisioner/automock" "github.com/kyma-project/kyma-environment-broker/internal/ptr" - "github.com/pivotal-cf/brokerapi/v8/domain" + "github.com/pivotal-cf/brokerapi/v11/domain" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/internal/process/upgrade_cluster/manager_test.go b/internal/process/upgrade_cluster/manager_test.go index 050dff3cc8..d4bb5e97b8 100644 --- a/internal/process/upgrade_cluster/manager_test.go +++ b/internal/process/upgrade_cluster/manager_test.go @@ -15,7 +15,7 @@ import ( "github.com/kyma-project/kyma-environment-broker/internal/event" "github.com/kyma-project/kyma-environment-broker/internal/process" - "github.com/pivotal-cf/brokerapi/v8/domain" + "github.com/pivotal-cf/brokerapi/v11/domain" "github.com/sirupsen/logrus" "github.com/stretchr/testify/assert" "k8s.io/apimachinery/pkg/util/wait" diff --git a/internal/process/upgrade_cluster_operation.go b/internal/process/upgrade_cluster_operation.go index e3d84abc6a..dbc24535df 100644 --- a/internal/process/upgrade_cluster_operation.go +++ b/internal/process/upgrade_cluster_operation.go @@ -8,7 +8,7 @@ import ( "github.com/kyma-project/kyma-environment-broker/internal" "github.com/kyma-project/kyma-environment-broker/internal/storage" "github.com/kyma-project/kyma-environment-broker/internal/storage/dberr" - "github.com/pivotal-cf/brokerapi/v8/domain" + "github.com/pivotal-cf/brokerapi/v11/domain" "github.com/sirupsen/logrus" ) diff --git a/internal/process/upgrade_cluster_operation_test.go b/internal/process/upgrade_cluster_operation_test.go index 04c41ab4ee..3591c23dc8 100644 --- a/internal/process/upgrade_cluster_operation_test.go +++ b/internal/process/upgrade_cluster_operation_test.go @@ -8,7 +8,7 @@ import ( "github.com/kyma-project/kyma-environment-broker/internal" "github.com/kyma-project/kyma-environment-broker/internal/fixture" "github.com/kyma-project/kyma-environment-broker/internal/storage" - "github.com/pivotal-cf/brokerapi/v8/domain" + "github.com/pivotal-cf/brokerapi/v11/domain" "github.com/sirupsen/logrus" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/internal/runtime/converter.go b/internal/runtime/converter.go index 8af3401858..cc7400f85b 100644 --- a/internal/runtime/converter.go +++ b/internal/runtime/converter.go @@ -4,7 +4,7 @@ import ( "github.com/kyma-project/kyma-environment-broker/common/orchestration" pkg "github.com/kyma-project/kyma-environment-broker/common/runtime" "github.com/kyma-project/kyma-environment-broker/internal" - "github.com/pivotal-cf/brokerapi/v8/domain" + "github.com/pivotal-cf/brokerapi/v11/domain" ) type Converter interface { diff --git a/internal/runtime/converter_test.go b/internal/runtime/converter_test.go index 7761e443b4..a2996e858b 100644 --- a/internal/runtime/converter_test.go +++ b/internal/runtime/converter_test.go @@ -8,7 +8,7 @@ import ( "github.com/kyma-project/kyma-environment-broker/common/orchestration" "github.com/kyma-project/kyma-environment-broker/common/runtime" "github.com/kyma-project/kyma-environment-broker/internal" - "github.com/pivotal-cf/brokerapi/v8/domain" + "github.com/pivotal-cf/brokerapi/v11/domain" "github.com/stretchr/testify/assert" ) diff --git a/internal/runtime/handler_test.go b/internal/runtime/handler_test.go index f280909979..1acdcbbbfb 100644 --- a/internal/runtime/handler_test.go +++ b/internal/runtime/handler_test.go @@ -23,7 +23,7 @@ import ( "github.com/kyma-project/kyma-environment-broker/internal/provisioner" "github.com/kyma-project/kyma-environment-broker/internal/ptr" "github.com/kyma-project/kyma-environment-broker/internal/runtime" - "github.com/pivotal-cf/brokerapi/v8/domain" + "github.com/pivotal-cf/brokerapi/v11/domain" "github.com/sirupsen/logrus" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/internal/servicebindingcleanup/service_test.go b/internal/servicebindingcleanup/service_test.go index 897c06f5ab..7bbd4d7eb8 100644 --- a/internal/servicebindingcleanup/service_test.go +++ b/internal/servicebindingcleanup/service_test.go @@ -14,7 +14,7 @@ import ( "github.com/kyma-project/kyma-environment-broker/internal/storage" "github.com/kyma-project/kyma-environment-broker/internal/storage/dberr" "github.com/kyma-project/kyma-environment-broker/internal/storage/driver/memory" - "github.com/pivotal-cf/brokerapi/v8/domain/apiresponses" + "github.com/pivotal-cf/brokerapi/v11/domain/apiresponses" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/internal/storage/dbmodel/instance_archived.go b/internal/storage/dbmodel/instance_archived.go index 761859602a..e39a028761 100644 --- a/internal/storage/dbmodel/instance_archived.go +++ b/internal/storage/dbmodel/instance_archived.go @@ -3,7 +3,7 @@ package dbmodel import ( "time" - "github.com/pivotal-cf/brokerapi/v8/domain" + "github.com/pivotal-cf/brokerapi/v11/domain" "github.com/kyma-project/kyma-environment-broker/internal" ) diff --git a/internal/storage/driver/memory/instance.go b/internal/storage/driver/memory/instance.go index f6dc700f8b..a067dd81d2 100644 --- a/internal/storage/driver/memory/instance.go +++ b/internal/storage/driver/memory/instance.go @@ -13,7 +13,7 @@ import ( "github.com/kyma-project/kyma-environment-broker/internal/storage/dberr" "github.com/kyma-project/kyma-environment-broker/internal/storage/dbmodel" "github.com/kyma-project/kyma-environment-broker/internal/storage/predicate" - "github.com/pivotal-cf/brokerapi/v8/domain" + "github.com/pivotal-cf/brokerapi/v11/domain" ) type instances struct { diff --git a/internal/storage/driver/memory/instance_archived.go b/internal/storage/driver/memory/instance_archived.go index cf22e7e9ae..3b1aee597c 100644 --- a/internal/storage/driver/memory/instance_archived.go +++ b/internal/storage/driver/memory/instance_archived.go @@ -8,7 +8,7 @@ import ( "github.com/kyma-project/kyma-environment-broker/internal/storage/dbmodel" - "github.com/pivotal-cf/brokerapi/v8/domain" + "github.com/pivotal-cf/brokerapi/v11/domain" "github.com/kyma-project/kyma-environment-broker/internal" "github.com/kyma-project/kyma-environment-broker/internal/storage/dberr" diff --git a/internal/storage/driver/memory/operation.go b/internal/storage/driver/memory/operation.go index 8ad3016613..308f2442f9 100644 --- a/internal/storage/driver/memory/operation.go +++ b/internal/storage/driver/memory/operation.go @@ -12,7 +12,7 @@ import ( "github.com/kyma-project/kyma-environment-broker/internal/storage/dberr" "github.com/kyma-project/kyma-environment-broker/internal/storage/dbmodel" - "github.com/pivotal-cf/brokerapi/v8/domain" + "github.com/pivotal-cf/brokerapi/v11/domain" ) const ( diff --git a/internal/storage/driver/postsql/conflict_test.go b/internal/storage/driver/postsql/conflict_test.go index 6a40bcb5b7..09beb028a2 100644 --- a/internal/storage/driver/postsql/conflict_test.go +++ b/internal/storage/driver/postsql/conflict_test.go @@ -7,7 +7,7 @@ import ( "github.com/kyma-project/kyma-environment-broker/internal" "github.com/kyma-project/kyma-environment-broker/internal/fixture" "github.com/kyma-project/kyma-environment-broker/internal/storage/dberr" - "github.com/pivotal-cf/brokerapi/v8/domain" + "github.com/pivotal-cf/brokerapi/v11/domain" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/internal/storage/driver/postsql/instance.go b/internal/storage/driver/postsql/instance.go index 4f09386345..2f9777fbca 100644 --- a/internal/storage/driver/postsql/instance.go +++ b/internal/storage/driver/postsql/instance.go @@ -5,7 +5,7 @@ import ( "fmt" "strings" - "github.com/pivotal-cf/brokerapi/v8/domain" + "github.com/pivotal-cf/brokerapi/v11/domain" "github.com/kyma-project/kyma-environment-broker/internal" "github.com/kyma-project/kyma-environment-broker/internal/storage/dberr" diff --git a/internal/storage/driver/postsql/instance_archived_test.go b/internal/storage/driver/postsql/instance_archived_test.go index 9443d329ae..39498200d1 100644 --- a/internal/storage/driver/postsql/instance_archived_test.go +++ b/internal/storage/driver/postsql/instance_archived_test.go @@ -9,7 +9,7 @@ import ( "github.com/kyma-project/kyma-environment-broker/internal/broker" - "github.com/pivotal-cf/brokerapi/v8/domain" + "github.com/pivotal-cf/brokerapi/v11/domain" "github.com/kyma-project/kyma-environment-broker/internal" "github.com/stretchr/testify/assert" diff --git a/internal/storage/driver/postsql/instance_test.go b/internal/storage/driver/postsql/instance_test.go index 46e3b31eee..813ee0225e 100644 --- a/internal/storage/driver/postsql/instance_test.go +++ b/internal/storage/driver/postsql/instance_test.go @@ -18,7 +18,7 @@ import ( "github.com/kyma-project/kyma-environment-broker/internal/storage/dberr" "github.com/kyma-project/kyma-environment-broker/internal/storage/dbmodel" "github.com/kyma-project/kyma-environment-broker/internal/storage/predicate" - "github.com/pivotal-cf/brokerapi/v8/domain" + "github.com/pivotal-cf/brokerapi/v11/domain" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/internal/storage/driver/postsql/operation.go b/internal/storage/driver/postsql/operation.go index 98bf21b17a..649a888f84 100644 --- a/internal/storage/driver/postsql/operation.go +++ b/internal/storage/driver/postsql/operation.go @@ -12,7 +12,7 @@ import ( "github.com/kyma-project/kyma-environment-broker/internal/storage/dbmodel" "github.com/kyma-project/kyma-environment-broker/internal/storage/postsql" - "github.com/pivotal-cf/brokerapi/v8/domain" + "github.com/pivotal-cf/brokerapi/v11/domain" log "github.com/sirupsen/logrus" "k8s.io/apimachinery/pkg/util/wait" ) diff --git a/internal/storage/driver/postsql/operation_test.go b/internal/storage/driver/postsql/operation_test.go index 4640832eab..c386b20a7d 100644 --- a/internal/storage/driver/postsql/operation_test.go +++ b/internal/storage/driver/postsql/operation_test.go @@ -11,7 +11,7 @@ import ( "github.com/kyma-project/kyma-environment-broker/internal/fixture" "github.com/kyma-project/kyma-environment-broker/internal/storage" "github.com/kyma-project/kyma-environment-broker/internal/storage/dbmodel" - "github.com/pivotal-cf/brokerapi/v8/domain" + "github.com/pivotal-cf/brokerapi/v11/domain" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/internal/storage/postsql/read.go b/internal/storage/postsql/read.go index e2eb2e4db1..c8f740195c 100644 --- a/internal/storage/postsql/read.go +++ b/internal/storage/postsql/read.go @@ -14,7 +14,7 @@ import ( "golang.org/x/exp/slices" "github.com/gocraft/dbr" - "github.com/pivotal-cf/brokerapi/v8/domain" + "github.com/pivotal-cf/brokerapi/v11/domain" ) type readSession struct { diff --git a/internal/suspension/handler.go b/internal/suspension/handler.go index a0da1bf338..eec19342f3 100644 --- a/internal/suspension/handler.go +++ b/internal/suspension/handler.go @@ -10,8 +10,8 @@ import ( "github.com/kyma-project/kyma-environment-broker/internal/broker" "github.com/kyma-project/kyma-environment-broker/internal/storage" "github.com/kyma-project/kyma-environment-broker/internal/storage/dberr" - "github.com/pivotal-cf/brokerapi/v8/domain" - "github.com/pivotal-cf/brokerapi/v8/domain/apiresponses" + "github.com/pivotal-cf/brokerapi/v11/domain" + "github.com/pivotal-cf/brokerapi/v11/domain/apiresponses" "github.com/sirupsen/logrus" ) diff --git a/internal/suspension/handler_test.go b/internal/suspension/handler_test.go index 86185b3e73..12c6d9593a 100644 --- a/internal/suspension/handler_test.go +++ b/internal/suspension/handler_test.go @@ -13,7 +13,7 @@ import ( "github.com/kyma-project/kyma-environment-broker/internal/fixture" "github.com/kyma-project/kyma-environment-broker/internal/ptr" "github.com/kyma-project/kyma-environment-broker/internal/storage" - "github.com/pivotal-cf/brokerapi/v8/domain" + "github.com/pivotal-cf/brokerapi/v11/domain" "github.com/sirupsen/logrus" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require"