Chore: Bump Go to 1.23.0 (#92105)
* chore: Bump Go to 1.23.0 Signed-off-by: Dave Henderson <dave.henderson@grafana.com> * update swagger files Signed-off-by: Dave Henderson <dave.henderson@grafana.com> * chore: update .bingo/README.md formatting to satisfy prettier Signed-off-by: Dave Henderson <dave.henderson@grafana.com> * chore(lint): Fix new lint errors found by golangci-lint 1.60.1 and Go 1.23 Signed-off-by: Dave Henderson <dave.henderson@grafana.com> * keep golden file * update openapi * add name to expected output * chore(lint): rearrange imports to a sensible order Signed-off-by: Dave Henderson <dave.henderson@grafana.com> --------- Signed-off-by: Dave Henderson <dave.henderson@grafana.com> Co-authored-by: Ryan McKinley <ryantxu@gmail.com>
This commit is contained in:
co-authored by
Ryan McKinley
parent
02c820382d
commit
df3d8915ba
@@ -126,11 +126,11 @@ type StorageGCSConfig struct {
|
||||
CredentialsFile string `json:"credentialsFile"`
|
||||
}
|
||||
|
||||
func newStorage(cfg RootStorageConfig, localWorkCache string) (storageRuntime, error) {
|
||||
func newStorage(cfg RootStorageConfig, _ string) (storageRuntime, error) {
|
||||
switch cfg.Type {
|
||||
case rootStorageTypeDisk:
|
||||
return newDiskStorage(RootStorageMeta{}, cfg), nil
|
||||
}
|
||||
|
||||
return nil, fmt.Errorf("unsupported store: " + cfg.Type)
|
||||
return nil, fmt.Errorf("unsupported store: %s", cfg.Type)
|
||||
}
|
||||
|
||||
@@ -153,6 +153,8 @@ func ProvideService(
|
||||
|
||||
// all externally-defined storages lie under the "content" root
|
||||
root.UnderContentRoot = true
|
||||
|
||||
// TODO: remove unused second argument
|
||||
s, err := newStorage(root, filepath.Join(cfg.DataPath, "storage", "cache", root.Prefix))
|
||||
if err != nil {
|
||||
grafanaStorageLogger.Warn("Error loading storage config", "error", err)
|
||||
|
||||
Reference in New Issue
Block a user