From 8958145b9646f348eae889741078d7c155aa0680 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 13 Nov 2024 16:14:43 +0000 Subject: [PATCH] chore(deps): bump sigs.k8s.io/cloud-provider-azure/pkg/azclient/configloader Bumps [sigs.k8s.io/cloud-provider-azure/pkg/azclient/configloader](https://github.com/kubernetes-sigs/cloud-provider-azure) from 0.1.4 to 0.1.5. - [Release notes](https://github.com/kubernetes-sigs/cloud-provider-azure/releases) - [Changelog](https://github.com/kubernetes-sigs/cloud-provider-azure/blob/master/docs/release-versioning.md) - [Commits](https://github.com/kubernetes-sigs/cloud-provider-azure/compare/pkg/azclient/v0.1.4...pkg/azclient/v0.1.5) --- updated-dependencies: - dependency-name: sigs.k8s.io/cloud-provider-azure/pkg/azclient/configloader dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- go.mod | 2 +- go.sum | 4 ++-- vendor/modules.txt | 2 +- .../pkg/azclient/configloader/load.go | 8 ++++---- .../pkg/azclient/configloader/loader_yaml.go | 12 ++++++------ 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/go.mod b/go.mod index 81854b8da..c68cda19d 100644 --- a/go.mod +++ b/go.mod @@ -40,7 +40,7 @@ require ( k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 sigs.k8s.io/cloud-provider-azure v1.31.1-0.20240914065912-f4dd79d54775 sigs.k8s.io/cloud-provider-azure/pkg/azclient v0.1.9 - sigs.k8s.io/cloud-provider-azure/pkg/azclient/configloader v0.1.4 + sigs.k8s.io/cloud-provider-azure/pkg/azclient/configloader v0.1.5 sigs.k8s.io/yaml v1.4.0 ) diff --git a/go.sum b/go.sum index 354b86cc8..c96114b83 100644 --- a/go.sum +++ b/go.sum @@ -465,8 +465,8 @@ sigs.k8s.io/cloud-provider-azure v1.31.1-0.20240914065912-f4dd79d54775 h1:0YqezU sigs.k8s.io/cloud-provider-azure v1.31.1-0.20240914065912-f4dd79d54775/go.mod h1:ZMuwABqLK6ICPch/wMIeMdTs15yH1lkPlwenTVzaB2A= sigs.k8s.io/cloud-provider-azure/pkg/azclient v0.1.9 h1:ZPt/hGm2GxdEZkN9LAfjz9NZxzqAkI9u0+mvzgeIWmQ= sigs.k8s.io/cloud-provider-azure/pkg/azclient v0.1.9/go.mod h1:6/RG0r3fZbHIfdMlwnsGGWcH08zoLC2vEeYV3kvJMFo= -sigs.k8s.io/cloud-provider-azure/pkg/azclient/configloader v0.1.4 h1:78nKI0bjXCXLKGccr2aITi0mJ1YScqMeoCiYSrzi3Ag= -sigs.k8s.io/cloud-provider-azure/pkg/azclient/configloader v0.1.4/go.mod h1:qpPLf/GsTSQV8pGzInA07hYT7OgwN5AqLoYf0i5qI2I= +sigs.k8s.io/cloud-provider-azure/pkg/azclient/configloader v0.1.5 h1:FrkM6pIC6b3dmrd3RgPqrOK44z9gFsR4NI5ZFlUtiQo= +sigs.k8s.io/cloud-provider-azure/pkg/azclient/configloader v0.1.5/go.mod h1:qpPLf/GsTSQV8pGzInA07hYT7OgwN5AqLoYf0i5qI2I= sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo= sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0= sigs.k8s.io/structured-merge-diff/v4 v4.4.1 h1:150L+0vs/8DA78h1u02ooW1/fFq/Lwr+sGiqlzvrtq4= diff --git a/vendor/modules.txt b/vendor/modules.txt index 1d1542923..208932515 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1691,7 +1691,7 @@ sigs.k8s.io/cloud-provider-azure/pkg/azclient/virtualmachinescalesetclient sigs.k8s.io/cloud-provider-azure/pkg/azclient/virtualmachinescalesetvmclient sigs.k8s.io/cloud-provider-azure/pkg/azclient/virtualnetworkclient sigs.k8s.io/cloud-provider-azure/pkg/azclient/virtualnetworklinkclient -# sigs.k8s.io/cloud-provider-azure/pkg/azclient/configloader v0.1.4 +# sigs.k8s.io/cloud-provider-azure/pkg/azclient/configloader v0.1.5 ## explicit; go 1.23.1 sigs.k8s.io/cloud-provider-azure/pkg/azclient/configloader # sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd diff --git a/vendor/sigs.k8s.io/cloud-provider-azure/pkg/azclient/configloader/load.go b/vendor/sigs.k8s.io/cloud-provider-azure/pkg/azclient/configloader/load.go index efa79c52b..63d6b1889 100644 --- a/vendor/sigs.k8s.io/cloud-provider-azure/pkg/azclient/configloader/load.go +++ b/vendor/sigs.k8s.io/cloud-provider-azure/pkg/azclient/configloader/load.go @@ -56,22 +56,22 @@ func Load[Type any](ctx context.Context, secretLoaderConfig *K8sSecretLoaderConf var err error if fileLoaderConfig != nil { loadConfigloader := newEmptyLoader[ConfigMergeConfig](&ConfigMergeConfig{CloudConfigType: CloudConfigTypeMerge}) - loadConfigloader = newFileLoader(fileLoaderConfig.FilePath, loadConfigloader, newYamlByteLoader[ConfigMergeConfig]) + loadConfigloader = newFileLoader(fileLoaderConfig.FilePath, loadConfigloader, NewYamlByteLoader[ConfigMergeConfig]) //by default the config load type is merge loadConfig, err = loadConfigloader.Load(ctx) if err != nil { return nil, err } - configloader = newFileLoader(fileLoaderConfig.FilePath, nil, newYamlByteLoader[Type]) + configloader = newFileLoader(fileLoaderConfig.FilePath, nil, NewYamlByteLoader[Type]) if strings.EqualFold(string(loadConfig.CloudConfigType), string(CloudConfigTypeFile)) { return configloader.Load(ctx) } } if secretLoaderConfig != nil { if loadConfig != nil && strings.EqualFold(string(loadConfig.CloudConfigType), string(CloudConfigTypeSecret)) { - configloader = newK8sSecretLoader(&secretLoaderConfig.K8sSecretConfig, secretLoaderConfig.KubeClient, nil, newYamlByteLoader[Type]) + configloader = newK8sSecretLoader(&secretLoaderConfig.K8sSecretConfig, secretLoaderConfig.KubeClient, nil, NewYamlByteLoader[Type]) } else { - configloader = newK8sSecretLoader(&secretLoaderConfig.K8sSecretConfig, secretLoaderConfig.KubeClient, configloader, newYamlByteLoader[Type]) + configloader = newK8sSecretLoader(&secretLoaderConfig.K8sSecretConfig, secretLoaderConfig.KubeClient, configloader, NewYamlByteLoader[Type]) } } return configloader.Load(ctx) diff --git a/vendor/sigs.k8s.io/cloud-provider-azure/pkg/azclient/configloader/loader_yaml.go b/vendor/sigs.k8s.io/cloud-provider-azure/pkg/azclient/configloader/loader_yaml.go index c5a8a1f30..346025834 100644 --- a/vendor/sigs.k8s.io/cloud-provider-azure/pkg/azclient/configloader/loader_yaml.go +++ b/vendor/sigs.k8s.io/cloud-provider-azure/pkg/azclient/configloader/loader_yaml.go @@ -23,14 +23,14 @@ import ( "sigs.k8s.io/yaml" ) -// yamlByteLoader is a FactoryConfigLoader that loads a YAML file from a byte array. -type yamlByteLoader[Type any] struct { +// YamlByteLoader is a FactoryConfigLoader that loads a YAML file from a byte array. +type YamlByteLoader[Type any] struct { content []byte configLoader[Type] } // Load loads the YAML file from the byte array and returns the client factory config. -func (s *yamlByteLoader[Type]) Load(ctx context.Context) (*Type, error) { +func (s *YamlByteLoader[Type]) Load(ctx context.Context) (*Type, error) { if s.configLoader == nil { s.configLoader = newEmptyLoader[Type](nil) } @@ -45,9 +45,9 @@ func (s *yamlByteLoader[Type]) Load(ctx context.Context) (*Type, error) { return config, nil } -// newYamlByteLoader creates a YamlByteLoader with the specified content and loader. -func newYamlByteLoader[Type any](content []byte, loader configLoader[Type]) configLoader[Type] { - return &yamlByteLoader[Type]{ +// NewYamlByteLoader creates a YamlByteLoader with the specified content and loader. +func NewYamlByteLoader[Type any](content []byte, loader configLoader[Type]) configLoader[Type] { + return &YamlByteLoader[Type]{ content: content, configLoader: loader, }