Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update dependencies #165

Merged
merged 4 commits into from
Aug 15, 2024
Merged

Update dependencies #165

merged 4 commits into from
Aug 15, 2024

Conversation

andyasp
Copy link
Collaborator

@andyasp andyasp commented Aug 12, 2024

It's been a couple months so time for another fun dependency update. Still hoping one day to clear up the test dependencies.

@andyasp
Copy link
Collaborator Author

andyasp commented Aug 12, 2024

Keeping as draft until I sort through the build errors. Done.

@@ -88,7 +88,7 @@ func NewCluster(ctx context.Context, t *testing.T, opts ...Option) Cluster {
},
}

clusterConfig, err := config.TransformSimpleToClusterConfig(ctx, runtimes.SelectedRuntime, simpleCfg)
clusterConfig, err := config.TransformSimpleToClusterConfig(ctx, runtimes.SelectedRuntime, simpleCfg, "")
Copy link
Collaborator Author

@andyasp andyasp Aug 12, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

"" is okay because the argument that was added is a file name which is only used if simpleCfg contained a non-empty Files field. Files is empty here.

@@ -45,11 +45,11 @@ func newInstrumentedRouter(metrics *metrics) (*mux.Router, http.Handler) {
router := mux.NewRouter()

httpMiddleware := []middleware.Interface{
middleware.Tracer{
middleware.RouteInjector{
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These changes are related to grafana/dskit#527

@andyasp andyasp marked this pull request as ready for review August 12, 2024 23:25
@andyasp andyasp force-pushed the aasp/update-dependencies branch from 6f87b99 to 9d2d183 Compare August 13, 2024 13:52
@andyasp andyasp merged commit 5be56c9 into main Aug 15, 2024
6 checks passed
@andyasp andyasp deleted the aasp/update-dependencies branch August 15, 2024 19:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants