refactor: replace experimental `maps` and `slices` with stdlib #6372

Juneezee · 2024-11-28T10:26:54Z

The experimental functions are now part of the standard library as of Go 1.21 and Go 1.23.

The key difference is that maps.Keys and maps.Values in the golang.org/x/exp package return a slice, whereas maps.Keys and maps.Values in the standard library return an iterator. To work with slices, we need to use slices.Collect to convert the iterator into a slice.

Reference: https://go.dev/doc/go1.21#slices
Reference: https://go.dev/doc/go1.23#iterators

Checklist

I have verified that my change is according to the deprecations & breaking changes policy
Changelog has been updated and is aligned with our changelog requirements
Commits are signed with Developer Certificate of Origin (DCO - learn more)

The experimental functions are now available in the standard library in Go 1.21 [1] and Go 1.23 [2]. [1]: https://go.dev/doc/go1.21#slices [2]: https://go.dev/doc/go1.23#iterators Signed-off-by: Eng Zer Jun <[email protected]>

Signed-off-by: Eng Zer Jun <[email protected]>

wozniakjan · 2024-12-02T13:34:32Z

/run-e2e internal|opentelemetry_metrics
Update: You can check the progress here

wozniakjan

lgtm, thank you!

wozniakjan · 2024-12-04T08:17:54Z

/run-e2e internal|opentelemetry_metrics

I just updated to latest main to check if this also works ok with #6378
Update: You can check the progress here

wozniakjan · 2024-12-04T08:24:08Z

I thought it might happen that we will need to bump go back to 1.23

https://github.com/kedacore/keda/actions/runs/12155644728/job/33897625757?pr=6372

pkg/scalers/scalersconfig/typed_config.go:206:18: slices.Sorted requires go1.23 or later (file is go1.22)
pkg/scalers/scalersconfig/typed_config.go:206:30: maps.Keys requires go1.23 or later (file is go1.22)
pkg/scalers/scalersconfig/typed_config.go:464:21: slices.Sorted requires go1.23 or later (file is go1.22)
pkg/scalers/scalersconfig/typed_config.go:464:33: maps.Keys requires go1.23 or later (file is go1.22)
make: *** [Makefile:147: vet] Error 1

Signed-off-by: Jan Wozniak <[email protected]>

wozniakjan · 2024-12-04T08:27:05Z

/run-e2e internal|opentelemetry_metrics
Update: You can check the progress here

Juneezee · 2024-12-04T09:37:05Z

I thought it might happen that we will need to bump go back to 1.23

https://github.com/kedacore/keda/actions/runs/12155644728/job/33897625757?pr=6372

pkg/scalers/scalersconfig/typed_config.go:206:18: slices.Sorted requires go1.23 or later (file is go1.22)
pkg/scalers/scalersconfig/typed_config.go:206:30: maps.Keys requires go1.23 or later (file is go1.22)
pkg/scalers/scalersconfig/typed_config.go:464:21: slices.Sorted requires go1.23 or later (file is go1.22)
pkg/scalers/scalersconfig/typed_config.go:464:33: maps.Keys requires go1.23 or later (file is go1.22)
make: *** [Makefile:147: vet] Error 1

@wozniakjan Thanks for correcting that for me 😊

JorTurFer · 2024-12-04T09:53:18Z

This PR will revert the toolchain change of #6378 @wozniakjan , is it okey?

zroubalik

Looking good, just a minor nit

go.mod

wozniakjan · 2024-12-04T16:19:37Z

This PR will revert the toolchain change of #6378 @wozniakjan , is it okey?

yeah, because at that point the toolchain and go versions are the same to support https://go.dev/doc/go1.23#iterators. I didn't realize this when approving #6378, but imho moving from experimental to core go packages has a higher value.

…ore#6372) Signed-off-by: Eng Zer Jun <[email protected]> Signed-off-by: Jan Wozniak <[email protected]> Co-authored-by: Jan Wozniak <[email protected]>

…ore#6372) Signed-off-by: Eng Zer Jun <[email protected]> Signed-off-by: Jan Wozniak <[email protected]> Co-authored-by: Jan Wozniak <[email protected]> Signed-off-by: Jorge Turrado <[email protected]>

* fix: CVE-2024-45337 (#6422) Signed-off-by: Jorge Turrado <[email protected]> * :fix: ensure consistent JSON log format for automaxprocs (#6335) * fix: ensure consistent JSON log format for automaxprocs Signed-off-by: Omer Aplatony <[email protected]> * moved to Unreleased Signed-off-by: Omer Aplatony <[email protected]> --------- Signed-off-by: Omer Aplatony <[email protected]> Signed-off-by: Jorge Turrado <[email protected]> * Upgrade to the latest new-relic-go v2 client (#6325) Signed-off-by: Jorge Turrado <[email protected]> * refactor: replace experimental `maps` and `slices` with stdlib (#6372) Signed-off-by: Eng Zer Jun <[email protected]> Signed-off-by: Jan Wozniak <[email protected]> Co-authored-by: Jan Wozniak <[email protected]> Signed-off-by: Jorge Turrado <[email protected]> * fix: Selenium Grid scaler exposes sum of pending and ongoing sessions to KDEA (#6368) Signed-off-by: Jorge Turrado <[email protected]> * fix: scaledjobs stuck as not ready (#6329) since code was missing for setting a scaledjob as ready it was stuck as unready if there ever was a problem This is a fix for a regression in #5916 Signed-off-by: Mårten Svantesson <[email protected]> Signed-off-by: Jorge Turrado <[email protected]> * fix: Paused ScaledObject count is reported correctly after operator restart (#6322) Signed-off-by: Jorge Turrado <[email protected]> * update changelog Signed-off-by: Jorge Turrado <[email protected]> * Bump go and deps (#6434) * Bump go and deps Signed-off-by: Jorge Turrado <[email protected]> * bump golang.org/x/net Signed-off-by: Jorge Turrado <[email protected]> * Add missing permissions to code-scaners Signed-off-by: Jorge Turrado <[email protected]> * update release tracker Signed-off-by: Jorge Turrado <[email protected]> * fix aws scaler Signed-off-by: Jorge Turrado <[email protected]> * Pass theregion Signed-off-by: Jorge Turrado <[email protected]> * Pass theregion Signed-off-by: Jorge Turrado <[email protected]> * fix aws tests Signed-off-by: Jorge Turrado <[email protected]> * fix aws tests Signed-off-by: Jorge Turrado <[email protected]> * Update AWS admission probes Signed-off-by: Jorge Turrado <[email protected]> --------- Signed-off-by: Jorge Turrado <[email protected]> Signed-off-by: Jorge Turrado <[email protected]> * commit last vendored deps Signed-off-by: Jorge Turrado <[email protected]> * fix: Selenium Grid in case multiple scaler triggers are activate (#6437) * fix: Selenium Grid scaler avoids overlapping when multiple browserVersion triggers are active Signed-off-by: Viet Nguyen Duc <[email protected]> * Update CHANGELOG Signed-off-by: Viet Nguyen Duc <[email protected]> * Fix e2e template test Signed-off-by: Viet Nguyen Duc <[email protected]> * Change imagePullPolicy to Always to take latest change Signed-off-by: Viet Nguyen Duc <[email protected]> * Update platformName default value as empty Signed-off-by: Viet Nguyen Duc <[email protected]> --------- Signed-off-by: Viet Nguyen Duc <[email protected]> Signed-off-by: Jorge Turrado <[email protected]> * add missing change Signed-off-by: Jorge Turrado <[email protected]> --------- Signed-off-by: Jorge Turrado <[email protected]> Signed-off-by: Omer Aplatony <[email protected]> Signed-off-by: Eng Zer Jun <[email protected]> Signed-off-by: Jan Wozniak <[email protected]> Signed-off-by: Mårten Svantesson <[email protected]> Signed-off-by: Jorge Turrado <[email protected]> Signed-off-by: Viet Nguyen Duc <[email protected]> Co-authored-by: Omer Aplatony <[email protected]> Co-authored-by: smcavallo <[email protected]> Co-authored-by: Eng Zer Jun <[email protected]> Co-authored-by: Jan Wozniak <[email protected]> Co-authored-by: Viet Nguyen Duc <[email protected]> Co-authored-by: Mårten Svantesson <[email protected]>

Juneezee added 2 commits November 28, 2024 18:19

refactor: replace experimental maps and slices with stdlib

f1ded60

The experimental functions are now available in the standard library in Go 1.21 [1] and Go 1.23 [2]. [1]: https://go.dev/doc/go1.21#slices [2]: https://go.dev/doc/go1.23#iterators Signed-off-by: Eng Zer Jun <[email protected]>

Run go mod tidy and go mod vendor

bc8a324

Signed-off-by: Eng Zer Jun <[email protected]>

Juneezee requested a review from a team as a code owner November 28, 2024 10:26

Update CHANGELOG.md

a4e4b7f

Signed-off-by: Eng Zer Jun <[email protected]>

wozniakjan approved these changes Dec 2, 2024

View reviewed changes

Merge branch 'main' into refactor/experimental-maps-slices

c96302a

chore: set go to 1.23 for core collections

feef255

Signed-off-by: Jan Wozniak <[email protected]>

wozniakjan force-pushed the refactor/experimental-maps-slices branch from eac0f43 to feef255 Compare December 4, 2024 08:26

zroubalik reviewed Dec 4, 2024

View reviewed changes

go.mod Show resolved Hide resolved

zroubalik approved these changes Dec 4, 2024

View reviewed changes

zroubalik merged commit c8be1c7 into kedacore:main Dec 4, 2024
24 checks passed

JorTurFer mentioned this pull request Dec 22, 2024

Release: 2.16.1 #6435

Closed

24 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

refactor: replace experimental `maps` and `slices` with stdlib #6372

refactor: replace experimental `maps` and `slices` with stdlib #6372

Juneezee commented Nov 28, 2024 •

edited

Loading

wozniakjan commented Dec 2, 2024 •

edited by github-actions bot

Loading

wozniakjan left a comment

wozniakjan commented Dec 4, 2024 •

edited by github-actions bot

Loading

wozniakjan commented Dec 4, 2024

wozniakjan commented Dec 4, 2024 •

edited by github-actions bot

Loading

Juneezee commented Dec 4, 2024

JorTurFer commented Dec 4, 2024

zroubalik left a comment

wozniakjan commented Dec 4, 2024

refactor: replace experimental maps and slices with stdlib #6372

refactor: replace experimental maps and slices with stdlib #6372

Conversation

Juneezee commented Nov 28, 2024 • edited Loading

Checklist

wozniakjan commented Dec 2, 2024 • edited by github-actions bot Loading

wozniakjan left a comment

Choose a reason for hiding this comment

wozniakjan commented Dec 4, 2024 • edited by github-actions bot Loading

wozniakjan commented Dec 4, 2024

wozniakjan commented Dec 4, 2024 • edited by github-actions bot Loading

Juneezee commented Dec 4, 2024

JorTurFer commented Dec 4, 2024

zroubalik left a comment

Choose a reason for hiding this comment

wozniakjan commented Dec 4, 2024

refactor: replace experimental `maps` and `slices` with stdlib #6372

refactor: replace experimental `maps` and `slices` with stdlib #6372

Juneezee commented Nov 28, 2024 •

edited

Loading

wozniakjan commented Dec 2, 2024 •

edited by github-actions bot

Loading

wozniakjan commented Dec 4, 2024 •

edited by github-actions bot

Loading

wozniakjan commented Dec 4, 2024 •

edited by github-actions bot

Loading