From e35d9a9f13ed84b27a2c77e8e4ae5b0800b970e7 Mon Sep 17 00:00:00 2001 From: Services Enablement CI Date: Fri, 28 Jun 2024 12:44:35 +0000 Subject: [PATCH] Bump ODB SDK to latest. --- go.mod | 4 ++-- go.sum | 18 +++++++-------- .../brokerapi/v11/domain/service_broker.go | 22 +++++++++---------- .../brokerapi/v11/domain/service_catalog.go | 2 +- .../brokerapi/v11/domain/service_metadata.go | 15 +++++++------ .../v11/domain/service_plan_metadata.go | 15 +++++++------ vendor/modules.txt | 4 ++-- 7 files changed, 40 insertions(+), 40 deletions(-) diff --git a/go.mod b/go.mod index d98a93dd..d851d3a2 100644 --- a/go.mod +++ b/go.mod @@ -10,7 +10,7 @@ require ( github.com/maxbrunsfeld/counterfeiter/v6 v6.8.1 github.com/onsi/ginkgo v1.16.5 github.com/onsi/gomega v1.33.1 - github.com/pivotal-cf/on-demand-services-sdk v0.46.1-0.20240612121937-d98b9d025720 + github.com/pivotal-cf/on-demand-services-sdk v0.46.1-0.20240628124157-645a5f6c3923 gopkg.in/yaml.v2 v2.4.0 ) @@ -39,7 +39,7 @@ require ( github.com/leodido/go-urn v1.4.0 // indirect github.com/nxadm/tail v1.4.8 // indirect github.com/pierrec/lz4/v4 v4.1.17 // indirect - github.com/pivotal-cf/brokerapi/v11 v11.0.0 // indirect + github.com/pivotal-cf/brokerapi/v11 v11.0.1 // indirect github.com/pkg/errors v0.9.1 // indirect github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect github.com/rogpeppe/go-internal v1.9.0 // indirect diff --git a/go.sum b/go.sum index e2e215f7..8f5fcacc 100644 --- a/go.sum +++ b/go.sum @@ -20,8 +20,8 @@ github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWo github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= github.com/gabriel-vasile/mimetype v1.4.3 h1:in2uUcidCuFcDKtdcBxlR0rJ1+fsokWf+uqxgUFjbI0= github.com/gabriel-vasile/mimetype v1.4.3/go.mod h1:d8uq/6HKRL6CGdk+aubisF/M5GcPfT7nKyLpA0lbSSk= -github.com/go-chi/chi/v5 v5.0.12 h1:9euLV5sTrTNTRUU9POmDUvfxyj6LAABLUcEWO+JJb4s= -github.com/go-chi/chi/v5 v5.0.12/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8= +github.com/go-chi/chi/v5 v5.0.14 h1:PyEwo2Vudraa0x/Wl6eDRRW2NXBvekgfxyydcM0WGE0= +github.com/go-chi/chi/v5 v5.0.14/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8= github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ= github.com/go-logr/logr v1.4.1/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-playground/assert/v2 v2.2.0 h1:JvknZsQTYeFEAhQwI4qEt9cyV5ONwRHC+lYKSsYSR8s= @@ -53,8 +53,8 @@ github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/pprof v0.0.0-20240424215950-a892ee059fd6 h1:k7nVchz72niMH6YLQNvHSdIE7iqsQxK1P41mySCvssg= github.com/google/pprof v0.0.0-20240424215950-a892ee059fd6/go.mod h1:kf6iHlnVGwgKolg33glAes7Yg/8iWP8ukqeldJSO7jw= -github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= -github.com/google/uuid v1.3.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= github.com/gorilla/securecookie v1.1.1/go.mod h1:ra0sb63/xPlUeL+yeDciTfxMRAA+MP+HVt/4epWDjd4= github.com/gorilla/sessions v1.2.1/go.mod h1:dk2InVEVJ0sfLlnXv9EAgkf6ecYs/i80K/zI+bUmuGM= github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= @@ -101,14 +101,12 @@ github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7J github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= github.com/onsi/gomega v1.33.1 h1:dsYjIxxSR755MDmKVsaFQTE22ChNBcuuTWgkUDSubOk= github.com/onsi/gomega v1.33.1/go.mod h1:U4R44UsT+9eLIaYRB2a5qajjtQYn0hauxvRm16AVYg0= -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/pierrec/lz4/v4 v4.1.17 h1:kV4Ip+/hUBC+8T6+2EgburRtkE9ef4nbY3f4dFhGjMc= github.com/pierrec/lz4/v4 v4.1.17/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= -github.com/pivotal-cf/brokerapi/v11 v11.0.0 h1:FxIrKdrFNAUyX8NAgPpdkJjwQ0vHmjbaPoxTPcAvcmY= -github.com/pivotal-cf/brokerapi/v11 v11.0.0/go.mod h1:MY40lQBKIChtmOpTVluTOyKQ9bW9p5fDszvXOEViIBQ= -github.com/pivotal-cf/on-demand-services-sdk v0.46.1-0.20240612121937-d98b9d025720 h1:rvKp6t4eyzJtj1600t/Va88nWbiEYPf7+UIFNDchEvY= -github.com/pivotal-cf/on-demand-services-sdk v0.46.1-0.20240612121937-d98b9d025720/go.mod h1:o7UULwarZqP+06tDmIS1ZXtXFCVHLOjcp133cHZ+kxY= +github.com/pivotal-cf/brokerapi/v11 v11.0.1 h1:X7X1PQF7uxNqXAjJo8+98t/zAJPqrIRP1tQExYsfjWM= +github.com/pivotal-cf/brokerapi/v11 v11.0.1/go.mod h1:kX76obQNqBfMQB2eVDzFnR8Es+EYEVgxkKwxrHpYJGY= +github.com/pivotal-cf/on-demand-services-sdk v0.46.1-0.20240628124157-645a5f6c3923 h1:C1wo7oONS8WucvylH4QW3clDsaRYJKM+hT6scBEFuLU= +github.com/pivotal-cf/on-demand-services-sdk v0.46.1-0.20240628124157-645a5f6c3923/go.mod h1:4eRU5HDQ5pdPxDt/ItuH3ND0C8ccXRN+WBVVxTQe+D8= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= diff --git a/vendor/github.com/pivotal-cf/brokerapi/v11/domain/service_broker.go b/vendor/github.com/pivotal-cf/brokerapi/v11/domain/service_broker.go index 3a9f3490..b19dde2f 100644 --- a/vendor/github.com/pivotal-cf/brokerapi/v11/domain/service_broker.go +++ b/vendor/github.com/pivotal-cf/brokerapi/v11/domain/service_broker.go @@ -76,8 +76,8 @@ type VolumeMount struct { } type SharedDevice struct { - VolumeId string `json:"volume_id"` - MountConfig map[string]interface{} `json:"mount_config"` + VolumeId string `json:"volume_id"` + MountConfig map[string]any `json:"mount_config"` } type ProvisionDetails struct { @@ -99,8 +99,8 @@ type ProvisionedServiceSpec struct { } type InstanceMetadata struct { - Labels map[string]string `json:"labels,omitempty"` - Attributes map[string]string `json:"attributes,omitempty"` + Labels map[string]any `json:"labels,omitempty"` + Attributes map[string]any `json:"attributes,omitempty"` } type DeprovisionDetails struct { @@ -115,10 +115,10 @@ type DeprovisionServiceSpec struct { } type GetInstanceDetailsSpec struct { - ServiceID string `json:"service_id"` - PlanID string `json:"plan_id"` - DashboardURL string `json:"dashboard_url"` - Parameters interface{} `json:"parameters"` + ServiceID string `json:"service_id"` + PlanID string `json:"plan_id"` + DashboardURL string `json:"dashboard_url"` + Parameters any `json:"parameters"` Metadata InstanceMetadata } @@ -193,7 +193,7 @@ type Binding struct { IsAsync bool `json:"is_async"` AlreadyExists bool `json:"already_exists"` OperationData string `json:"operation_data"` - Credentials interface{} `json:"credentials"` + Credentials any `json:"credentials"` SyslogDrainURL string `json:"syslog_drain_url"` RouteServiceURL string `json:"route_service_url"` BackupAgentURL string `json:"backup_agent_url,omitempty"` @@ -201,11 +201,11 @@ type Binding struct { } type GetBindingSpec struct { - Credentials interface{} + Credentials any SyslogDrainURL string RouteServiceURL string VolumeMounts []VolumeMount - Parameters interface{} + Parameters any } func (d ProvisionDetails) GetRawContext() json.RawMessage { diff --git a/vendor/github.com/pivotal-cf/brokerapi/v11/domain/service_catalog.go b/vendor/github.com/pivotal-cf/brokerapi/v11/domain/service_catalog.go index fc02cb22..3cac4e6f 100644 --- a/vendor/github.com/pivotal-cf/brokerapi/v11/domain/service_catalog.go +++ b/vendor/github.com/pivotal-cf/brokerapi/v11/domain/service_catalog.go @@ -52,7 +52,7 @@ type ServiceBindingSchema struct { } type Schema struct { - Parameters map[string]interface{} `json:"parameters"` + Parameters map[string]any `json:"parameters"` } type RequiredPermission string diff --git a/vendor/github.com/pivotal-cf/brokerapi/v11/domain/service_metadata.go b/vendor/github.com/pivotal-cf/brokerapi/v11/domain/service_metadata.go index 926aae23..42053b44 100644 --- a/vendor/github.com/pivotal-cf/brokerapi/v11/domain/service_metadata.go +++ b/vendor/github.com/pivotal-cf/brokerapi/v11/domain/service_metadata.go @@ -2,9 +2,8 @@ package domain import ( "encoding/json" + "fmt" "reflect" - - "github.com/pkg/errors" ) type ServiceMetadata struct { @@ -15,7 +14,7 @@ type ServiceMetadata struct { DocumentationUrl string `json:"documentationUrl,omitempty"` SupportUrl string `json:"supportUrl,omitempty"` Shareable *bool `json:"shareable,omitempty"` - AdditionalMetadata map[string]interface{} + AdditionalMetadata map[string]any } func (sm ServiceMetadata) MarshalJSON() ([]byte, error) { @@ -23,11 +22,13 @@ func (sm ServiceMetadata) MarshalJSON() ([]byte, error) { b, err := json.Marshal(Alias(sm)) if err != nil { - return []byte{}, errors.Wrap(err, "unmarshallable content in AdditionalMetadata") + return nil, fmt.Errorf("unmarshallable content in AdditionalMetadata: %w", err) } - var m map[string]interface{} - json.Unmarshal(b, &m) + var m map[string]any + if err := json.Unmarshal(b, &m); err != nil { + return nil, err + } delete(m, additionalMetadataName) for k, v := range sm.AdditionalMetadata { @@ -43,7 +44,7 @@ func (sm *ServiceMetadata) UnmarshalJSON(data []byte) error { return err } - additionalMetadata := map[string]interface{}{} + additionalMetadata := map[string]any{} if err := json.Unmarshal(data, &additionalMetadata); err != nil { return err } diff --git a/vendor/github.com/pivotal-cf/brokerapi/v11/domain/service_plan_metadata.go b/vendor/github.com/pivotal-cf/brokerapi/v11/domain/service_plan_metadata.go index fbb329d8..60df3142 100644 --- a/vendor/github.com/pivotal-cf/brokerapi/v11/domain/service_plan_metadata.go +++ b/vendor/github.com/pivotal-cf/brokerapi/v11/domain/service_plan_metadata.go @@ -2,17 +2,16 @@ package domain import ( "encoding/json" + "fmt" "reflect" "strings" - - "github.com/pkg/errors" ) type ServicePlanMetadata struct { DisplayName string `json:"displayName,omitempty"` Bullets []string `json:"bullets,omitempty"` Costs []ServicePlanCost `json:"costs,omitempty"` - AdditionalMetadata map[string]interface{} + AdditionalMetadata map[string]any } type ServicePlanCost struct { @@ -27,7 +26,7 @@ func (spm *ServicePlanMetadata) UnmarshalJSON(data []byte) error { return err } - additionalMetadata := map[string]interface{}{} + additionalMetadata := map[string]any{} if err := json.Unmarshal(data, &additionalMetadata); err != nil { return err } @@ -51,11 +50,13 @@ func (spm ServicePlanMetadata) MarshalJSON() ([]byte, error) { b, err := json.Marshal(Alias(spm)) if err != nil { - return []byte{}, errors.Wrap(err, "unmarshallable content in AdditionalMetadata") + return nil, fmt.Errorf("unmarshallable content in AdditionalMetadata: %w", err) } - var m map[string]interface{} - json.Unmarshal(b, &m) + var m map[string]any + if err := json.Unmarshal(b, &m); err != nil { + return nil, err + } delete(m, additionalMetadataName) for k, v := range spm.AdditionalMetadata { diff --git a/vendor/modules.txt b/vendor/modules.txt index 13565119..b9289f3e 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -180,10 +180,10 @@ github.com/pierrec/lz4/v4/internal/lz4block github.com/pierrec/lz4/v4/internal/lz4errors github.com/pierrec/lz4/v4/internal/lz4stream github.com/pierrec/lz4/v4/internal/xxh32 -# github.com/pivotal-cf/brokerapi/v11 v11.0.0 +# github.com/pivotal-cf/brokerapi/v11 v11.0.1 ## explicit; go 1.21 github.com/pivotal-cf/brokerapi/v11/domain -# github.com/pivotal-cf/on-demand-services-sdk v0.46.1-0.20240612121937-d98b9d025720 +# github.com/pivotal-cf/on-demand-services-sdk v0.46.1-0.20240628124157-645a5f6c3923 ## explicit; go 1.21 github.com/pivotal-cf/on-demand-services-sdk/bosh github.com/pivotal-cf/on-demand-services-sdk/serviceadapter