Skip to content

Commit 3c9d868

Browse files
authored
refactor: drop MetricsConfig from ToolchainStatus type (codeready-toolchain#1264)
--------- Signed-off-by: Xavier Coulon <xcoulon@redhat.com>
1 parent cd620d9 commit 3c9d868

3 files changed

Lines changed: 9 additions & 11 deletions

File tree

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
module github.com/codeready-toolchain/toolchain-e2e
22

33
require (
4-
github.com/codeready-toolchain/api v0.0.0-20260226033043-912fcbd23dc7
5-
github.com/codeready-toolchain/toolchain-common v0.0.0-20260226040150-d7d5d0163ff7
4+
github.com/codeready-toolchain/api v0.0.0-20260305144020-4ff0e6b6e174
5+
github.com/codeready-toolchain/toolchain-common v0.0.0-20260305144813-52d9242e8c74
66
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc
77
github.com/fatih/color v1.18.0
88
github.com/ghodss/yaml v1.0.0

go.sum

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@ github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMn
2626
github.com/cloudflare/circl v1.1.0/go.mod h1:prBCrKB9DV4poKZY1l9zBXg2QJY7mvgRvtMxxK7fi4I=
2727
github.com/cloudflare/circl v1.6.3 h1:9GPOhQGF9MCYUeXyMYlqTR6a5gTrgR/fBLXvUgtVcg8=
2828
github.com/cloudflare/circl v1.6.3/go.mod h1:2eXP6Qfat4O/Yhh8BznvKnJ+uzEoTQ6jVKJRn81BiS4=
29-
github.com/codeready-toolchain/api v0.0.0-20260226033043-912fcbd23dc7 h1:1YCopXDF7WSjhM7sQAFoNeJvoIVPCHDY35jNVqc0Xh4=
30-
github.com/codeready-toolchain/api v0.0.0-20260226033043-912fcbd23dc7/go.mod h1:PMg6kNHuCGNlu3MOdrCisqGkBpvzB0qS1+E6nrXxPAc=
31-
github.com/codeready-toolchain/toolchain-common v0.0.0-20260226040150-d7d5d0163ff7 h1:NLTKW/An6PfcgqUyjeloAl0cmR0/lJopURsMMY/VZcs=
32-
github.com/codeready-toolchain/toolchain-common v0.0.0-20260226040150-d7d5d0163ff7/go.mod h1:TtwbNKTtHxDEaO2fOhJbYM4S1FykJHOf/4/nCw7hFwo=
29+
github.com/codeready-toolchain/api v0.0.0-20260305144020-4ff0e6b6e174 h1:hed3ZyardxswS6yMB0ME9l3vEkO+pFouyk4dvIiAQOo=
30+
github.com/codeready-toolchain/api v0.0.0-20260305144020-4ff0e6b6e174/go.mod h1:PMg6kNHuCGNlu3MOdrCisqGkBpvzB0qS1+E6nrXxPAc=
31+
github.com/codeready-toolchain/toolchain-common v0.0.0-20260305144813-52d9242e8c74 h1:yxKX0m6Kk1AIWwaGpf25flTfTrYrEJ9TyLW5NEQSq0Y=
32+
github.com/codeready-toolchain/toolchain-common v0.0.0-20260305144813-52d9242e8c74/go.mod h1:NEnnq2R5GYoWdN0b0iaSdX7L1ndrzxl3ML0m7XLsSqk=
3333
github.com/cpuguy83/go-md2man/v2 v2.0.6/go.mod h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6NIQQ7OS05n1F4g=
3434
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
3535
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=

test/metrics/metrics_test.go

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -671,9 +671,7 @@ func TestForceMetricsSynchronization(t *testing.T) {
671671
// given
672672
awaitilities := WaitForDeployments(t)
673673
hostAwait := awaitilities.Host()
674-
hostAwait.UpdateToolchainConfig(t,
675-
testconfig.AutomaticApproval().Enabled(true),
676-
testconfig.Metrics().ForceSynchronization(false))
674+
hostAwait.UpdateToolchainConfig(t, testconfig.AutomaticApproval().Enabled(true))
677675

678676
userSignups := CreateMultipleSignupsWithMURs(t, awaitilities, nil, 2)
679677

@@ -706,9 +704,9 @@ func TestForceMetricsSynchronization(t *testing.T) {
706704
require.NoError(t, err)
707705
}
708706

709-
t.Run("verify metrics are still correct after restarting pod and forcing recount", func(t *testing.T) {
707+
t.Run("verify metrics are still correct after restarting pod", func(t *testing.T) {
710708
// given
711-
hostAwait.UpdateToolchainConfig(t, testconfig.Metrics().ForceSynchronization(true))
709+
hostAwait.UpdateToolchainConfig(t)
712710

713711
// when restarting the pod
714712
// TODO: unneeded once the ToolchainConfig controller will be in place ?

0 commit comments

Comments
 (0)